Merge branches 'dev' and 'dev_voice_scan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice_scan

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

@@ -66,7 +66,12 @@ public abstract class BaseRequestLogAspect {
             resultInfoLog(transactionSerial, getExecPeriod(startTime), result);
         } catch (RenException e) {
             result = handleRenException(e);
-            resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
+            if (e.getCode() > 8000) {
+                resultWarnLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
+            } else {
+                resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
+            }
+            return result;
         } catch (ValidateException e) {
             result = handleValidateException(e);
             resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e));
@@ -95,7 +100,7 @@ public abstract class BaseRequestLogAspect {
     }
 
     /**
-     * 异常信息
+     * 异常错误级别日志
      * @param transactionSerial
      * @param execTimeMillis
      * @param result
@@ -107,6 +112,19 @@ public abstract class BaseRequestLogAspect {
                 transactionSerial, execTimeMillis, result == null ? result : result.toString(), exceptionMsg, exceptionDetail);
     }
 
+    /**
+     * 异常警告级别日志
+     * @param transactionSerial
+     * @param execTimeMillis
+     * @param result
+     * @param exceptionMsg
+     * @param exceptionDetail
+     */
+    private void resultWarnLog(String transactionSerial, Long execTimeMillis, Object result, String exceptionMsg, String exceptionDetail) {
+        log.warn("<<<<<<<<异常响应<<<<<<<<:事务流水号:{}, 执行时长:{}ms, 响应数据:{}, 异常信息:{}, 堆栈信息:{}",
+                transactionSerial, execTimeMillis, result == null ? result : result.toString(), exceptionMsg, exceptionDetail);
+    }
+
     /**
      * 计算执行周期
      * @param startTime

epmet-gateway/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.39
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.42
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.39</version>
+    <version>0.3.42</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.45
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.52
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.45</version>
+    <version>0.3.52</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -73,7 +73,7 @@
     <select id="selectUserDistributionAgency" resultType="com.epmet.evaluationindex.screen.dto.result.UserDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
-            sca.center_mark AS centerMark,
+            IFNULL(sca.center_mark,'') AS centerMark,
             sutd.user_total AS totalNum,
             sca.area_marks AS areaMarks,
             sca.agency_name AS subName,

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -23,7 +23,7 @@
         SELECT
             scg.grid_id AS gridId,
             scg.grid_name AS gridName,
-            scg.party_mark AS partyMark
+            IFNULL(scg.party_mark,'') AS partyMark
         FROM
             screen_customer_grid scg
             LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = scg.PARENT_AGENCY_ID AND sca.IS_DISPLAY = 1
@@ -37,7 +37,7 @@
     <select id="selectUserDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.UserDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
-            scg.center_mark AS centerMark,
+            IFNULL(scg.center_mark,'') AS centerMark,
             sutd.user_total AS totalNum,
             scg.area_marks AS areaMarks,
             scg.grid_name AS subName,

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@@ -12,7 +12,7 @@
             ROUND(diff.EVENT_COST_TIME/60,0) AS totalHours,
             diff.EVENT_SOURCE AS gridName,
             diff.EVENT_IMG_URL AS imgUrl,
-            diff.EVENT_CATEGORY_NAME AS categoryName,
+            IFNULL(diff.EVENT_CATEGORY_NAME,'') AS categoryName,
             diff.EVENT_RE_ORG AS handleDepts,
             diff.EVENT_RE_ORG AS handleCount
         FROM

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.69
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.74
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.69</version>
+    <version>0.3.74</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java

@@ -69,12 +69,11 @@ public interface ScreenCpcBaseDataDao extends BaseDao<ScreenCpcBaseDataEntity> {
     /**
      * @Description  删除旧的党员基本信息
      * @param customerId
-     * @param dateId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
-    Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("dateId") String dateId,@Param("orgIds")List<String> orgIds);
+    Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("orgIds")List<String> orgIds);
 
     /**
      * @Description  查询党员信息【根据agencyId来查】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java

@@ -319,7 +319,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
         }
         Integer delNum;
         do {
-            delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, dateId, orgIds);
+            delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, orgIds);
         }while (delNum > NumConstant.ZERO);
         List<List<PartyBaseInfoFormDTO>> partition = ListUtils.partition(finalResult, NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java

@@ -43,12 +43,11 @@ public interface ScreenCpcBaseDataService extends BaseService<ScreenCpcBaseDataE
     /**
      * @Description  删除旧的党员基本信息
      * @param customerId
-     * @param dateId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
-    Integer deleteOldPartyBaseInfo(String customerId, String dateId, List<String> orgIds);
+    Integer deleteOldPartyBaseInfo(String customerId, List<String> orgIds);
 
     /**
      * @Description  查询党员信息【根据agencyId来查】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java

@@ -51,14 +51,13 @@ public class ScreenCpcBaseDataServiceImpl extends BaseServiceImpl<ScreenCpcBaseD
     /**
      * @Description  删除旧的党员基本信息
      * @param customerId
-     * @param dateId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
     @Override
-    public Integer deleteOldPartyBaseInfo(String customerId, String dateId, List<String> orgIds) {
-        return baseDao.deleteOldPartyBaseInfo(customerId, dateId,orgIds);
+    public Integer deleteOldPartyBaseInfo(String customerId, List<String> orgIds) {
+        return baseDao.deleteOldPartyBaseInfo(customerId,orgIds);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml

@@ -187,7 +187,6 @@
     <delete id="deleteOldPartyBaseInfo">
         delete from screen_cpc_base_data
         where CUSTOMER_ID = #{customerId}
-        and DATA_END_TIME = #{dateId}
         and
             (
                 <foreach collection="orgIds" item="orgId" separator=" OR ">

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -17,11 +17,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 
@@ -52,11 +55,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
     <choose>
@@ -91,11 +97,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 
@@ -131,11 +140,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 
@@ -299,11 +311,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 
@@ -332,11 +347,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.24
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.25
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.24</version>
+    <version>0.3.25</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-common-service</artifactId>

epmet-module/epmet-ext/epmet-ext-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-ext.jar
 
 EXPOSE 8113
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-ext-server:
     container_name: epmet-ext-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.8
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.13
     ports:
       - "8113:8113"
     network_mode: host # 使用现有网络

epmet-module/epmet-ext/epmet-ext-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.8</version>
+    <version>0.0.13</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-heart/epmet-heart-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-heart.jar
 
 EXPOSE 8090
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.54
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.57
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.54</version>
+    <version>0.0.57</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.27
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.29
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.27</version>
+    <version>0.3.29</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.29
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.32
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.29</version>
+    <version>0.3.32</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-prod
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.25
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.27
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.25</version>
+    <version>0.3.27</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-oss</artifactId>

epmet-module/epmet-third/epmet-third-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-third.jar
 
 EXPOSE 8110
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.149
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.156
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.149</version>
+    <version>0.0.156</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/gov-access/gov-access-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-access.jar
 
 EXPOSE 8099
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.39
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.44
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

epmet-module/gov-access/gov-access-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.40</version>
+    <version>0.3.44</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml

@@ -34,7 +34,9 @@
     <select id="listAllRoleOperationScopesByRoleId" resultType="com.epmet.dto.result.RoleOpeScopeResultDTO">
         SELECT rs.ROLE_ID, rs.OPERATION_KEY, rs.SCOPE_KEY, os.SCOPE_INDEX, os.SERIES, os.SORT
         FROM role_scope rs
-                 INNER JOIN operation_scope os ON (rs.SCOPE_KEY = os.SCOPE_KEY)
+                 INNER JOIN role_operation ro
+                    ON (rs.ROLE_ID = ro.ROLE_ID AND ro.OPERATION_KEY = rs.OPERATION_KEY AND ro.DEL_FLAG = 0)
+                 INNER JOIN operation_scope os ON (rs.SCOPE_KEY = os.SCOPE_KEY AND os.DEL_FLAG = 0)
         WHERE rs.DEL_FLAG = 0
           AND rs.ROLE_ID = #{roleId}
         ORDER BY rs.OPERATION_KEY ASC

epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.37
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.39
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络

epmet-module/gov-grid/gov-grid-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.37</version>
+    <version>0.3.39</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>

epmet-module/gov-issue/gov-issue-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-issue.jar
 
 EXPOSE 8101
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.52
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.57
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.52</version>
+    <version>0.3.57</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.34
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.35
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-mine/gov-mine-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.34</version>
+    <version>0.3.35</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>

epmet-module/gov-org/gov-org-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-org.jar
 
 EXPOSE 8092
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.92
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.96
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.92</version>
+    <version>0.3.96</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -206,4 +206,14 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      **/
     List<OrganizeTreeResultDTO> selectAllSub(@Param("agencyId") String agencyId);
+
+    /**
+     * @param agencyId      组织id
+     * @param operateUserId 当前操作人
+     * @return int
+     * @author yinzuomei
+     * @description
+     * @Date 2020/12/15 10:04
+     **/
+    int delByAgencyId(@Param("agencyId") String agencyId, @Param("operateUserId") String operateUserId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java

@@ -18,12 +18,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerDepartmentDTO;
 import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.result.AgencyDeptList;
 import com.epmet.dto.result.DepartmentListResultDTO;
-import com.epmet.dto.result.SubListResultDTO;
 import com.epmet.entity.CustomerDepartmentEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -93,4 +91,14 @@ public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity>
      * @return void
      */
     void deleteStaffDep(@Param("staffId") String staffId);
+
+    /**
+     * @return int
+     * @param deptId 部门id
+     * @param operateUserId 当前操作人id
+     * @author yinzuomei
+     * @description
+     * @Date 2020/12/15 10:05
+     **/
+    int delDeptById(@Param("deptId")String deptId,@Param("operateUserId") String operateUserId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerAgencyConstant;
@@ -67,7 +68,8 @@ public class AgencyServiceImpl implements AgencyService {
     private StaffServiceImpl staffServiceImpl;
     @Autowired
     private CustomerGridDao customerGridDao;
-
+    @Autowired
+    private LoginUserUtil loginUserUtil;
     /**
      * @param formDTO
      * @return
@@ -199,7 +201,7 @@ public class AgencyServiceImpl implements AgencyService {
             return result;
         }
         //4:删除当前机关组织（逻辑删）
-        if (customerAgencyDao.deleteById(formDTO.getAgencyId()) < NumConstant.ONE) {
+        if (customerAgencyDao.delByAgencyId(formDTO.getAgencyId(),loginUserUtil.getLoginUserId()) < NumConstant.ONE) {
             log.error(CustomerAgencyConstant.DEL_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.DEL_EXCEPTION);
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@@ -21,16 +21,16 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerDepartmentConstant;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerDepartmentDao;
 import com.epmet.dao.CustomerStaffDepartmentDao;
-import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.CustomerDepartmentDTO;
+import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
-import com.epmet.dto.StaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
@@ -49,7 +49,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -73,7 +72,8 @@ public class DepartmentServiceImpl implements DepartmentService {
     private CustomerStaffDepartmentService customerStaffDepartmentService;
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
-
+    @Autowired
+    private LoginUserUtil loginUserUtil;
     /**
      * @param formDTO
      * @return
@@ -139,7 +139,7 @@ public class DepartmentServiceImpl implements DepartmentService {
             return result;
         }
         //2:删除部门信息（逻辑删）
-        if (customerDepartmentDao.deleteById(formDTO.getDepartmentId()) < NumConstant.ONE) {
+        if (customerDepartmentDao.delDeptById(formDTO.getDepartmentId(),loginUserUtil.getLoginUserId()) < NumConstant.ONE) {
             log.error(CustomerDepartmentConstant.DEL_EXCEPTION);
             throw new RenException(CustomerDepartmentConstant.DEL_EXCEPTION);
         }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -381,4 +381,12 @@
     <select id="getAgencyElementTree" resultMap="elementTreeAgency">
         select id,organization_name,customer_id from customer_agency where pid = #{pid} and customer_id = #{customerId}
     </select>
+
+    <update id="delByAgencyId" parameterType="map">
+        update customer_agency
+         set updated_by = #{operateUserId},
+            del_flag = '1',
+            UPDATED_TIME=NOW()
+        where id=#{agencyId}
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -76,4 +76,12 @@
         AND ca.del_flag = '0'
         AND cd.agency_id = #{agencyId}
     </select>
+
+    <update id="delDeptById" parameterType="map">
+        update customer_department
+        set updated_by = #{operateUserId},
+            del_flag = '1',
+            UPDATED_TIME=NOW()
+        where id=#{deptId}
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -194,7 +194,8 @@
         set
             grid_name = #{gridName},
             manage_district = #{manageDistrict},
-            updated_by = #{updatedBy}
+            updated_by = #{updatedBy},
+            UPDATED_TIME=NOW()
         where
             id = #{id}
     </update>
@@ -205,7 +206,8 @@
             customer_grid
         set
             updated_by = #{userId},
-            del_flag = 1
+            del_flag = 1,
+            UPDATED_TIME=NOW()
         where
             id = #{gridId}
     </update>

epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.46
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.48
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

epmet-module/gov-project/gov-project-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.46</version>
+    <version>0.3.48</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.68
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.69
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.68</version>
+    <version>0.3.69</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.71
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.72
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.71</version>
+    <version>0.3.72</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>

epmet-module/resi-group/resi-group-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-group.jar
 
 EXPOSE 8095
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.67
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.76
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.67</version>
+    <version>0.3.76</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -386,7 +386,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//4、校验是否已经注册居民
 		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
-			logger.error(String.format("用户同意邀请进组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+			logger.warn(String.format("用户通过邀请链接入组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
 			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
 		UserRoleDTO userRoleDTO=this.getUserRoleDTO(result.getData().getUserRoleList());
@@ -480,7 +480,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//4、校验是否已经注册居民
 		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
-			logger.error(String.format("用户同意邀请进组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+			logger.warn(String.format("用户通过扫码入组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
 			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
 		//2020.11.17 sun 新增扫描或邀请进组是否需要审核的逻辑  start

epmet-module/resi-hall/resi-hall-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-hall.jar
 
 EXPOSE 8100
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-hall-server:
     container_name: resi-hall-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.24
     ports:
       - "8100:8100"
     network_mode: host # 使用现有网络

epmet-module/resi-hall/resi-hall-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.22</version>
+    <version>0.3.24</version>
     <parent>
         <artifactId>resi-hall</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/resi-mine/resi-mine-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-mine.jar
 
 EXPOSE 8094
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.42
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.45
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.42</version>
+    <version>0.3.45</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.58
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.61
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.58</version>
+    <version>0.3.61</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java

@@ -24,10 +24,10 @@ public class WxUserInfoFormDTO implements Serializable {
     /**
      * 性别0未知1男性2女性
      */
-    @NotBlank(message = "性别不能为空")
+    //@NotBlank(message = "性别不能为空")
     private String gender;
 
-    @NotBlank(message = "头像不能为空")
+    //@NotBlank(message = "头像不能为空")
     private String avatarUrl;
 
     //@NotBlank(message = "所在省份不能为空")

epmet-user/epmet-user-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-user.jar
 
 EXPOSE 8087
 
-ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.129
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.137
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.129</version>
+    <version>0.3.137</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -192,6 +192,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
 	@Override
 	public Result<List<StaffGridListDTO>> selectStaffGridListByUserId(List<UserIdAndPidDTO> customerStaffGridDTOS) {
+		if (CollectionUtils.isEmpty(customerStaffGridDTOS)){
+			return new Result<List<StaffGridListDTO>>().ok(new ArrayList<>());
+		}
 		List<GovStaffRoleResultDTO> gridManager = staffRoleService.listStaffsInRole(UserRoleConstant.GRID_MANAGER, customerStaffGridDTOS.get(0).getPid(), DataScope.getDefault());
 		List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS);
 		for (GovStaffRoleResultDTO govStaffRoleResultDTO : gridManager) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -123,8 +123,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         //前台和后台已有实体字段不对于 需要挨个赋值
         userWechatDTO.setUserId(wxUserInfoFormDTO.getUserId());
         userWechatDTO.setNickname(wxUserInfoFormDTO.getNickName() == null ? null : wxUserInfoFormDTO.getNickName());
-        userWechatDTO.setSex(Integer.parseInt(wxUserInfoFormDTO.getGender()));
-        userWechatDTO.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl());
+        userWechatDTO.setSex(Integer.parseInt(wxUserInfoFormDTO.getGender() == null ? "0" : wxUserInfoFormDTO.getGender()));
+        userWechatDTO.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl() == null ? null : wxUserInfoFormDTO.getAvatarUrl());
         userWechatDTO.setCountry(wxUserInfoFormDTO.getCountry() == null ? null : wxUserInfoFormDTO.getCountry());
         userWechatDTO.setProvince(wxUserInfoFormDTO.getProvince() == null ? null : wxUserInfoFormDTO.getProvince());
         userWechatDTO.setCity(wxUserInfoFormDTO.getCity() == null ? null : wxUserInfoFormDTO.getCity());