呼叫权限 全局权限合菜单权限合到一起

sobot_common/src/main/java/com/sobot/common/login/SobotLoginTools.java

@@ -17,6 +17,7 @@ import com.sobot.network.apiUtils.SobotBaseCode;
 import com.sobot.network.apiUtils.SobotHttpUtils;
 import com.sobot.network.http.HttpBaseUtils;
 import com.sobot.utils.SobotSharedPreferencesUtil;
+import com.sobot.utils.SobotStringUtils;
 
 import org.json.JSONArray;
 
@@ -130,6 +131,17 @@ public class SobotLoginTools {
                             List<ServiceFunctionVoModel> functions = new ArrayList<>();
                             JSONArray items = resonseObj.optJSONArray("items");
                             getListByObj(functions, items);
+                            if (serviceInfoModel.getGlobalPermissions() != null) {
+                                //全局权限
+                                for (int i = 0; i < serviceInfoModel.getGlobalPermissions().size(); i++) {
+                                    if (!SobotStringUtils.isEmpty(serviceInfoModel.getGlobalPermissions().get(i))) {
+                                        ServiceFunctionVoModel functionVoModel = new ServiceFunctionVoModel();
+                                        functionVoModel.setCode(serviceInfoModel.getGlobalPermissions().get(i));
+                                        functions.add(functionVoModel);
+                                    }
+
+                                }
+                            }
                             serviceInfoModel.setFunctionStr(functions);
                             //保存在数据库
                             ServiceInfoManager.getInstance().saveInfo(serviceInfoModel);