Merge branch 'master' of http://git.elinkit.com.cn:7070/r/empet_cloud_yantai; branch 'yantai_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 烟台master

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -641,7 +641,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         }
 
         List<StaffRoleResultDTO> roleList = govStaffRoleDao.getStaffRoleList(staffId);
-        Map<String, String> roleMap = roleList.stream().collect(Collectors.toMap(StaffRoleResultDTO::getRoleKey, StaffRoleResultDTO::getRoleName));
+        Map<String, String> roleMap = roleList.stream().collect(Collectors.toMap(StaffRoleResultDTO::getRoleKey, StaffRoleResultDTO::getRoleName,(o1,o2)->o1));
         result.setRoleMap(roleMap);
 
         //1.查询工作人员所在的网格列表

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

@@ -421,7 +421,7 @@
         SELECT
             cg.id gridId,
             CONCAT(
-                ca.organization_name,
+                cu.organization_name,
                 "-",
                 cg.grid_name
             ) agencyGridName,
@@ -431,6 +431,7 @@
             IFNULL(cg.latitude, ca.latitude) latitude
         FROM
             customer_grid cg
+        INNER JOIN customer_agency cu ON cu.id = cg.pid AND cu.customer_id = cg.customer_id
         INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
         WHERE
             cg.del_flag = '0'

epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml

@@ -143,7 +143,7 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
-        <root level="DEBUG">
+        <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
             <appender-ref ref="WARN_FILE"/>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -447,12 +447,11 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      */
     List<String> getUserId(String icResiUserId);
 
+    List<IcResiUserDTO> getListIcResiUserDTO(List<String> icResiUserIdList);
+
     /**
      * desc:设置居民的pids pids为agencyId的pids+agencyId 即包含组织本身 如果pids 为空则pids 为agencyId
      * @param entity
      */
     void setIcResiUserPids(IcResiUserEntity entity);
-
-    List<IcResiUserDTO> getListIcResiUserDTO(List<String> icResiUserIdList);
-
 }

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml

@@ -50,6 +50,7 @@
         d.DEL_FLAG = '0'
         <if test="customerId != null and customerId != ''">
             AND d.CUSTOMER_ID = #{customerId}
+            AND u.CUSTOMER_ID = #{customerId}
         </if>
         <if test="gridId != null and gridId != ''">
             AND d.GRID_ID = #{gridId}

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml

@@ -74,6 +74,7 @@
         r.DEL_FLAG = '0'
         <if test="customerId != null and customerId != ''">
             AND r.CUSTOMER_ID = #{customerId}
+            AND u.CUSTOMER_ID = #{customerId}
         </if>
         <if test="gridId != null and gridId != ''">
             AND r.AGENCY_ID = #{gridId}

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml

@@ -48,6 +48,7 @@
         w.DEL_FLAG = '0'
         <if test="customerId != null and customerId != ''">
             AND w.CUSTOMER_ID = #{customerId}
+            AND u.CUSTOMER_ID = #{customerId}
         </if>
         <if test="gridId != null and gridId != ''">
             AND w.GRID_ID = #{gridId}

epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml

@@ -33,8 +33,8 @@
             IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime,
             IFNULL(v.vaccinationCount,0) AS vaccinationCount
         FROM ic_epidemic_special_attention a
-        LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND  b.del_flag = '0'
+        LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND  b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID
-        LEFT JOIN (SELECT id_card ,count(1) AS vaccinationCount FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD) v ON (v.ID_CARD = a.ID_CARD)
+        LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID)
         WHERE a.DEL_FLAG = 0
           AND a.ORG_ID = #{orgId}
           AND a.ATTENTION_TYPE = #{attentionType}
@@ -79,7 +79,7 @@
         b.HOME_ID,
         IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime
         FROM ic_epidemic_special_attention a
-        LEFT JOIN ic_resi_user b ON a.id_card = b.id_card  AND  b.del_flag = '0'
+        LEFT JOIN ic_resi_user b ON a.id_card = b.id_card  AND  b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID
         WHERE a.DEL_FLAG = 0
         AND a.ORG_ID = #{orgId}
         AND a.ATTENTION_TYPE = #{attentionType}