From 5b8bd390799c201ddc9b0a2edc1f277bdbadd155 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 21 Mar 2022 15:51:06 +0800
Subject: [PATCH] =?UTF-8?q?/heart/work/act/sponsorlist=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=BB=E5=8A=9E=E6=96=B9=E4=B8=8D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=BA=9F=E5=BC=83=E7=9A=84=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java
index c1a7f52efa..dfe6f02296 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java
@@ -88,7 +88,7 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
 	 * @return com.epmet.dto.result.ActSponsorResultDTO
 	 * @param staffId
 	 * @author yinzuomei
-	 * @description 根据staffId查询我所在的网格信息
+	 * @description 根据staffId查询我所在的网格信息，限制网格是未废弃的网格
 	 * @Date 2020/7/23 21:04 
 	 **/
 	List<ActSponsorGridInfo>  selectActSponsorGrid(String staffId);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index aa2d4fed1b..2cb746aab6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -872,6 +872,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             resultDTO.setAgencyId(customerAgency.getId());
             resultDTO.setAgencyName(customerAgency.getOrganizationName());
         }
+        //限制网格是未废弃的网格
         List<ActSponsorGridInfo> list=customerStaffAgencyDao.selectActSponsorGrid(staffId);
         resultDTO.setAgencyGridList(list);
         return resultDTO;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
index 5f471060b6..698cdcacaf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
@@ -125,7 +125,7 @@
         </if>
     </select>
 
-    <!--   根据staffId查询我所在的网格信息 -->
+    <!--   根据staffId查询我所在的网格信息，限制网格是未废弃的网格 -->
     <select id="selectActSponsorGrid" resultType="com.epmet.dto.result.ActSponsorGridInfo" parameterType="java.lang.String">
         SELECT
             csg.GRID_ID,
@@ -136,6 +136,7 @@
             LEFT JOIN customer_agency ca ON ( cg.PID = ca.ID AND ca.DEL_FLAG = '0' )
         WHERE
             csg.DEL_FLAG = '0'
+            and cg.ABANDON_FLAG='0'
             AND csg.USER_ID =#{staffId}
     </select>
     <!--    根据staffId，查询我所属的组织信息 -->