Merge remote-tracking branch 'origin/dev'

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) {
+                for (String areaCode : list) {
-                    if (next.getAreaCode().equals(usedAreaCode1)) {
+                    if (next.getAreaCode().equals(areaCode)) {
-                        iterator.remove();
-                    }
-                }
-                for (String usedAreaCode2 : usedAreaCodeList2) {
-                    if (next.getAreaCode().contains(usedAreaCode2)) {
                         iterator.remove();
                     }
                 }

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>
 
     <!-- 报事详情 -->
@@ -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>
 
     <!-- 更新报事人红点状态 -->

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>