Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/bin/deploy.sh

@@ -84,6 +84,7 @@ project_deploy() {
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
   tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
+  build_service ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   start_service
   writelog "${PROJECT_NAME}_deploy_finish"
 }

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

@@ -9,7 +9,13 @@
         count( 1 )
         FROM
         mortals_sys_matter AS a
-        LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter WHERE siteId = #{condition.siteId} ) AS b ON a.matterNo = b.matterCode
+        LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter
+        <trim suffixOverrides="where" suffix="">
+            <if test="condition.siteId!=null and condition.siteId!=''">
+                 a.siteId = #{condition.siteId,jdbcType=VARCHAR}
+            </if>
+        </trim>
+         )AS b ON a.matterNo = b.matterCode
         <trim suffixOverrides="where" suffix="">
             where b.matterCode IS NULL and
             <trim prefixOverrides="and" prefix="">
@@ -32,7 +38,13 @@
         <include refid="_columns"/>
         FROM
         mortals_sys_matter AS a
-        LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter WHERE siteId = #{condition.siteId} ) AS b ON a.matterNo = b.matterCode
+        LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter
+        <trim suffixOverrides="where" suffix="">
+            <if test="condition.siteId!=null and condition.siteId!=''">
+                 a.siteId = #{condition.siteId,jdbcType=VARCHAR}
+            </if>
+        </trim>
+        ) AS b ON a.matterNo = b.matterCode
         <trim suffixOverrides="where" suffix="">
             where b.matterCode IS NULL and
             <trim prefixOverrides="and" prefix="">

portal-manager/src/main/bin/deploy.sh

@@ -84,6 +84,7 @@ project_deploy() {
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
   tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
+  build_service ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   start_service
   writelog "${PROJECT_NAME}_deploy_finish"
 }

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);

smart-gateway/src/main/bin/deploy.sh

@@ -77,6 +77,7 @@ project_deploy() {
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
   tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
+  build_service ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   start_service
   writelog "${PROJECT_NAME}_deploy_finish"
 }