Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java

@@ -63,7 +63,6 @@ public interface ScreenWorkRecordOrgDailyDao extends BaseDao<ScreenWorkRecordOrg
 
 
     WorkRecordSubRank selectUpToCalAgency(@Param("agencyId")String agencyId,
-                                          @Param("agencyName")String agencyName,
                                           @Param("dateId")String dateId,
                                           @Param("typeCodeList") List<String> typeCodeList);
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -116,8 +116,10 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         //2）、下级所有组织
         List<WorkRecordSubRank> subAgencyRankList = new ArrayList<>();
         for(ScreenCustomerAgencyCommonDTO agencyCommonDTO:agencyInfoDTO.getSubAgencies()){
-            WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),agencyCommonDTO.getAgencyName(),dateId,typeCodeList);
+            WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),dateId,typeCodeList);
             if(null !=agencyRes){
+                agencyRes.setOrgId(agencyCommonDTO.getAgencyId());
+                agencyRes.setName(agencyCommonDTO.getAgencyName());
                 agencyRes.setIsDefault("no");
                 subAgencyRankList.add(agencyRes);
             }else{

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml

@@ -109,8 +109,6 @@
 
     <select id="selectUpToCalAgency" parameterType="map" resultType="com.epmet.plugins.result.WorkRecordSubRank">
         SELECT
-            #{agencyId} as orgId
-            #{agencyName} AS `NAME`,
             sum( m.PARTICIPATE_USER_TOTAL ) AS participateUserTotal,
             sum( m.ORGANIZE_TOTAL ) AS participateTotal
         FROM

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

@@ -241,6 +241,7 @@
         WHERE
             agency.DEL_FLAG = '0'
             AND agency.AREA_CODE like concat(#{areaCode},'%')
+            AND LENGTH(agency.PARENT_AREA_CODE) > 0
     </select>
 
     <!--   查找组织下的部门  -->

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

@@ -193,7 +193,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
         List<CustomerUser4PointResultDTO> allData = userWechatDao.selectResiAndStrangerInfo(customerUserFormDTO.getCustomerId(),customerUserFormDTO.getName());
-        if (!CollectionUtils.isEmpty(allData)){
+        if (CollectionUtils.isEmpty(allData)){
             return new ArrayList<>();
         }
         allData.forEach(info -> {