/heart/work/act/sponsorlist发布活动主办方不展示废弃的网格

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);

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;

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，查询我所属的组织信息 -->