From 21e9b4227347183439e7e5215e7d6daf61167d4d Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 29 Jul 2020 14:05:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E5=86=B5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ActLiveRecServiceImpl.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
index 81304f99ba..d1f11ccf68 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
+++ b/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);
     }

From 01e9cfba266a6880044be1b2cf012ca3c7b698af Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 29 Jul 2020 14:17:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=8C=BA=E4=B8=8B=E7=9A=84=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomerGridServiceImpl.java |  4 +-
 .../main/resources/mapper/CustomerGridDao.xml | 42 -------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 403e93f3d1..8f023276a3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/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("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
+            //map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
+            //map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
             map.put("pageSize",listCustomerGridFormDTO.getPageSize());
             map.put("pageNo",listCustomerGridFormDTO.getPageNo());
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index ef5998325e..75d92f8a6a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -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
-
-
-
-        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>

From 8fa14f19a225d89015b129c02aa3bdf75119710f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 29 Jul 2020 14:20:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=8C=BA=E4=B8=8B=E7=9A=84=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerGridDao.xml             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 75d92f8a6a..802ec9f2f3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -65,7 +65,7 @@
 
         SELECT c.*
         FROM
-        (
+
 
         (
         SELECT
@@ -99,7 +99,7 @@
         ORDER BY
           CONVERT ( gridName USING gbk ) ASC
 
-        )
+        ) c
 
 
         LIMIT #{pageNo}, #{pageSize}