From ff9b33907ebcc5a0caa8fb0dbabdfdaf8f74c978 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 13 Aug 2021 10:44:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ResiEventDao.xml                | 2 +-
 .../src/main/resources/mapper/ResiEventMentionDao.xml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 0142b1a3df..fc1f3a67ce 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -97,7 +97,7 @@
                 and re.READ_FLAG='1'
                 and re.`STATUS`=#{statusCondition}
             </if>
-            order by re.LATEST_OPERATED_TIME desc
+            order by re.LATEST_OPERATED_TIME desc,rea.sort asc
     </select>
 
     <!-- 报事详情 -->
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 28548eaad9..b7c65d32be 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -46,11 +46,11 @@
             AND rem.READ_FLAG =#{readFlag}
         <if test='readFlag == "un_read" '>
             ORDER BY
-            re.CREATED_TIME ASC
+            re.CREATED_TIME ASC,rea.sort asc
         </if>
         <if test='readFlag == "read" '>
             ORDER BY
-            re.LATEST_OPERATED_TIME DESC
+            re.LATEST_OPERATED_TIME DESC,rea.sort asc
         </if>
     </select>
 

From f97d492d2b3db9f2969811be6d17a2905fb740ac Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 13 Aug 2021 13:56:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=EF=BC=9A=E5=9B=BE=E7=89=87=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ResiEventDao.xml                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index fc1f3a67ce..f9fc875f7e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -143,6 +143,7 @@
         LEFT JOIN resi_event_report_org ro ON (ro.RESI_EVENT_ID = re.ID AND ro.DEL_FLAG = '0')
         WHERE re.DEL_FLAG = '0'
             AND re.ID = #{eventId}
+        order by ea.sort asc
     </select>
 
     <!-- 更新报事人红点状态 -->

From 95088b8a3d8c433eebe1e59dcecbb69faf1c032b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 13 Aug 2021 17:48:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87=EF=BC=8Cbugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../govorg/impl/GovOrgServiceImpl.java        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 8cfe95113f..eff9f0bdd2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
@@ -151,17 +152,22 @@ public class GovOrgServiceImpl implements GovOrgService {
             List<String> usedAreaCodeList1 = customerAgencyDao.selectUsedAreaCodeList(formDTO.getAreaCode());
             //外部子客户：
             List<String> usedAreaCodeList2 = customerRelation.selectUsedAreaCodeList(formDTO.getAreaCode());
+            List<String> list=new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(usedAreaCodeList1)){
+                list.addAll(usedAreaCodeList1);
+            }
+            if(CollectionUtils.isNotEmpty(usedAreaCodeList2)){
+                list.addAll(usedAreaCodeList2);
+            }
+            HashSet set = new HashSet(list);
+            list.clear();
+            list.addAll(set);
             //已经被使用的移除不显示
             Iterator<NextAreaCodeResultDTO> iterator = allList.iterator();
             while (iterator.hasNext()) {
                 NextAreaCodeResultDTO next = iterator.next();
-                for (String usedAreaCode1 : usedAreaCodeList1) {
-                    if (next.getAreaCode().equals(usedAreaCode1)) {
-                        iterator.remove();
-                    }
-                }
-                for (String usedAreaCode2 : usedAreaCodeList2) {
-                    if (next.getAreaCode().contains(usedAreaCode2)) {
+                for (String areaCode : list) {
+                    if (next.getAreaCode().equals(areaCode)) {
                         iterator.remove();
                     }
                 }