Merge remote-tracking branch 'origin/master'

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -74,7 +74,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             List<MenuEntity> menuList = menuService.findTreeMenuByUser(userEntity);
             userEntity.setMenuList(menuList);
             data.put("user", userEntity);
-            if(userEntity.getId()==1){
+            if(userEntity.getId()==1 && StringUtils.isEmpty(userEntity.getAreaCodes())){
                 JSONArray siteList = new JSONArray();
                 JSONObject siteObject = new JSONObject();
                 siteObject.put("id",0);

portal-manager/src/main/java/com/mortals/xhx/module/model/ModelController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.ModelPdu;
@@ -81,7 +82,7 @@ public class ModelController extends BaseJsonBodyController {
             }
             ModelPdu modelPdu = new ModelPdu();
             modelPdu.setSiteId(query.getSiteId());
-            if(this.getCurUser().getId()==1){
+            if(this.getCurUser().getId()==1 && StringUtils.isEmpty(this.getCurUser().getSiteIds())){
                 modelPdu.setIsAdmin(1);
             }else {
                 modelPdu.setIsAdmin(0);