Merge remote-tracking branch 'remotes/origin/dev_heart' into dev

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java

@@ -130,6 +130,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
                 logger.error("未查到用户基础信息");
                 throw new RenException("未查到用户基础信息");
             }
+        } else {
+            resultDto.setActLives(new ArrayList<>());
+            resultDto.setActLiveNum(NumConstant.ZERO);
         }
         return new Result<ResiActLiveRecResultDTO>().ok(resultDto);
     }

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

@@ -154,8 +154,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             //cx代表市
             //yz代表区
             map.put("areaCode",areaCode);
-            map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
+            //map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
-            map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
+            //map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
             map.put("pageSize",listCustomerGridFormDTO.getPageSize());
             map.put("pageNo",listCustomerGridFormDTO.getPageNo());
 

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

@@ -65,7 +65,7 @@
 
         SELECT c.*
         FROM
-        (
+
 
         (
         SELECT
@@ -98,52 +98,10 @@
         a.area_code = #{areaCode}
         ORDER BY
           CONVERT ( gridName USING gbk ) ASC
-        LIMIT 0,999999999999
-
-        )
-
-        UNION
-
-        (
-        SELECT
-        b.id AS grid_id,
-        b.customer_id,
-        concat(agency.fullname , '-' ,b.grid_name) as gridName
-        FROM
-        CUSTOMER_GRID b
-
-
-        LEFT JOIN (
-        SELECT
-        a1.id,
-        CASE
-
-        WHEN a2.ORGANIZATION_NAME IS NULL THEN
-        a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
-        END AS fullname
-        FROM
-        customer_agency a1
-        LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
-        AND a1.del_flag = '0'
-        WHERE
-        a1.del_flag = '0'
-        ) agency ON b.PID = agency.ID
-
 
+        ) c
 
-        WHERE
-        b.del_flag = 0
-        AND
-        b.area_code LIKE CONCAT(#{cityCode},'%')
 
-        AND  <![CDATA[ b.area_code <> #{areaCode}
-                ]]>
-        ORDER BY
-        	b.area_code DESC ,CONVERT ( gridName USING gbk ) ASC
-        LIMIT 0,999999999999
-
-        )
-        ) AS c
         LIMIT #{pageNo}, #{pageSize}
 
     </select>