From 2dfb87e3ada412309fc8e09b77e4607d1b34a311 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 10 Oct 2022 13:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IssueApplicationServiceImpl.java  | 9 ++++++---
 .../src/main/resources/mapper/IssueApplicationDao.xml    | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java
index 24806fd924..1dc8212e67 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java
@@ -46,6 +46,7 @@ import com.epmet.service.IssueApplicationService;
 import com.epmet.utils.ModuleConstants;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -62,6 +63,7 @@ import java.util.Map;
  * @since v1.0.0 2020-11-17
  */
 @Service
+@Slf4j
 public class IssueApplicationServiceImpl extends BaseServiceImpl<IssueApplicationDao, IssueApplicationEntity> implements IssueApplicationService {
 
     @Override
@@ -208,14 +210,15 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl<IssueApplicatio
             List<IssueApplicationDTO> list = pageInfo.getList();
             size = list.size();
             if (CollectionUtils.isNotEmpty(list)){
-                list.forEach(l -> {
+                for (IssueApplicationDTO l : list) {
                     GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId());
                     if (null == gridInfo){
-                        throw new EpmetException("查询网格信息失败："+l.getGridId());
+                        log.warn("查询网格信息失败："+l.getGridId());
+                        continue;
                     }
                     l.setOrgId(gridInfo.getPid());
                     l.setOrgIdPath(gridInfo.getPids());
-                });
+                }
                 updateIssueApplication(list);
             }
             no++;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml
index c205c2004f..293d28f383 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml
@@ -7,19 +7,19 @@
         <trim prefix="set" suffixOverrides=",">
             <trim prefix="ORG_ID = (case" suffix="end),">
                 <foreach collection="list" item="i" index="index">
-                    when ID = #{i.ID} then #{orgId}
+                    when ID = #{i.id} then #{i.orgId}
                 </foreach>
             </trim>
             <trim prefix="ORG_ID_PATH = (case" suffix="end),">
                 <foreach collection="list" item="i" index="index">
-                    when ID = #{i.ID} then #{ORG_ID_PATH}
+                    when ID = #{i.id} then #{i.orgIdPath}
                 </foreach>
             </trim>
             updated_time = now()
             where 1=1
             <trim prefix="AND ( " suffix=" )">
                 <foreach collection="list" separator="or" item="i" index="index" >
-                    ID = #{i.ID}
+                    ID = #{i.id}
                 </foreach>
             </trim>
         </trim>