From 4f675e4d0bce4a15667cf8fe3acd8ed8dff73446 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 8 Apr 2022 14:14:54 +0800
Subject: [PATCH 1/2] latestSubmit

---
 .../src/main/java/com/epmet/dao/IcResiCollectDao.java        | 2 +-
 .../com/epmet/service/impl/IcResiCollectServiceImpl.java     | 5 ++++-
 .../src/main/resources/mapper/IcResiCollectDao.xml           | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
index 2602b5858a..547ef63ca8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
@@ -40,5 +40,5 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
      * @param userId
      * @return
      */
-    String selectLastSubmitId(@Param("customerId") String customerId, @Param("userId") String userId);
+    List<String> selectLastSubmitId(@Param("customerId") String customerId, @Param("userId") String userId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index 39efa26144..fe75c7acbb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -25,6 +26,7 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcResiCollectService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -209,7 +211,8 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         resDTO.setAgencyId(gridInfoCache.getPid());
         resDTO.setPids(null != agencyInfoCache ? agencyInfoCache.getPids() : StrConstant.EPMETY_STR);
         resDTO.setAgencyName(gridInfoCache.getAgencyName());
-        String latestResiCollectId = baseDao.selectLastSubmitId(formDTO.getCustomerId(), formDTO.getUserId());
+        List<String> resiCoolectIds = baseDao.selectLastSubmitId(formDTO.getCustomerId(), formDTO.getUserId());
+        String latestResiCollectId = CollectionUtils.isNotEmpty(resiCoolectIds) ? resiCoolectIds.get(NumConstant.ZERO) : StrConstant.EPMETY_STR;
         if (StringUtils.isNotBlank(latestResiCollectId)) {
             resDTO.setResiCollectId(latestResiCollectId);
             //之前提交过
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
index 98725fa04e..777622c9f5 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
@@ -84,6 +84,5 @@
             AND ( m.CREATED_BY = #{userId} OR m.UPDATED_BY = #{userId} )
         ORDER BY
             m.UPDATED_TIME DESC
-            LIMIT 1
     </select>
 </mapper>
\ No newline at end of file

From 8847f4b3c5f2361fcadaf640ff9d9a55bae4ed51 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 8 Apr 2022 14:16:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index abfa49ba17..38d58ce001 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1287,6 +1287,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public PageData<EpidemicPreventionResultDTO> userList(EpidemicPreventionFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null != staffInfo) {
+            formDTO.setAgencyId(staffInfo.getAgencyId());
+        }
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<EpidemicPreventionResultDTO> list = new ArrayList<>();
         if (formDTO.getAttentionType().equals(NumConstant.TWO)){