1.fix

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java

@@ -14,7 +14,8 @@ public interface IcSpecialDao extends BaseDao<IcSpecialEntity> {
     public IcSpecialEntity selectByResiId(@Param("resiId") String resiId);
 
     List<LingShanSpecialCrowdListResultDTO> listSpecialCrowd(@Param("orgIdPath") String orgIdPath,
-                                                             @Param("agencyId") String agencyId,
+                                                             @Param("orgId") String orgId,
+                                                             @Param("orgType") String orgType,
                                                              @Param("specialType") String specialType,
                                                              @Param("name") String name,
                                                              @Param("mobile") String mobile,

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java

@@ -612,10 +612,12 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
         if (StringUtils.isNotBlank(orgId)) {
             orgIdPath = CustomerOrgRedis.getOrgIdPath(orgId, orgType);
         } else {
+             // 前端没传递，那就用当前staff所属的
             orgIdPath = epmetUserRemoteService.getLoginUserDetails().getOrgIdPath();
+            orgType = "agency";
         }
         PageHelper.startPage(pageNo, pageSize);
-        List<LingShanSpecialCrowdListResultDTO> l = icSpecialDao.listSpecialCrowd(orgIdPath, orgType, specialType, name, mobile, idCard);
+        List<LingShanSpecialCrowdListResultDTO> l = icSpecialDao.listSpecialCrowd(orgIdPath, orgId, orgType, specialType, name, mobile, idCard);
         // List<LingShanSpecialCrowdListResultDTO> l = specialCrowdPersonTypeDao.listSpecialCrowds(orgIdPath, orgType, specialType, name, mobile, idCard);
         l.forEach(i -> {
             IcResiUserDTO resi = icResiUserDao.getResiUserByIdCard(i.getIdCard(), customerId);

epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml

@@ -18,19 +18,25 @@
              , s.SPECIAL_RQLB SPECIAL_TYPES_STR
         from ic_resi_user r
                  inner join ic_special s on (r.ID = s.IC_RESI_USER and s.DEL_FLAG = 0)
-        where r.DEL_FLAG = 0
+        where
+            r.DEL_FLAG = 0
+            and (r.PIDS like CONCAT(#{orgIdPath}, '%')
+                <if test="orgType == 'agency'">
+                    or r.AGENCY_ID = #{orgId}
+                </if>
+                <if test="orgType == 'grid'">
+                    or r.GRID_ID = #{orgId}
+                </if>
+            )
             <if test="name != null and name != ''">
                 and r.NAME like CONCAT('%', #{name}, '%')
             </if>
             <if test="specialType != null and specialType != ''">
-                and s.SPECIAL_RQLB like #{specialType}
+                and s.SPECIAL_RQLB like CONCAT('%', #{specialType}, '%')
             </if>
             <if test="idCard != null and idCard != ''">
                 and r.ID_CARD like CONCAT('%', #{idCard}, '%')
             </if>
-            <if test="orgIdPath != null and orgIdPath != ''">
-                and r.PIDS like CONCAT(#{orgIdPath}, '%') or r.AGENCY_ID = #{agencyId}
-            </if>
             <if test="mobile != null and mobile != ''">
                 and r.MOBILE like CONCAT('%', #{mobile}, '%')
             </if>