增加数据隔离

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java

@@ -16,7 +16,6 @@ import com.epmet.dto.PovertyManageDTO;
 import com.epmet.dto.form.povertyManage.PovertyManageFormDto;
 import com.epmet.excel.PovertyManageExcel;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
-import com.epmet.remote.EpmetUserRemoteService;
 import com.epmet.service.PovertyManageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +41,8 @@ public class PovertyManageController {
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
 
-    @Autowired
+//    @Autowired
-    private EpmetUserRemoteService userRemoteService;
+//    private EpmetUserRemoteService userRemoteService;
 
 
     @RequestMapping("page")

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

@@ -20,5 +20,5 @@ public interface PovertyCondoleDao extends BaseDao<PovertyCondoleEntity> {
     List<PovertyCondoleDTO> search(@Param("userName") String userName, @Param("idCard") String idCard,
                                    @Param("condoleStaff") String condoleStaff, @Param("povertyType") String povertyType,
                                    @Param("povertyStatus") String povertyStatus, @Param("content") String content,
-                                   @Param("startTime") String startTime, @Param("endTime") String endTime);
+                                   @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("orgIdPath") String orgIdPath);
 }

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

@@ -17,7 +17,7 @@ public interface PovertyManageDao extends BaseDao<PovertyManageEntity> {
 
     List<PovertyManageDTO> search(@Param("userName") String userName, @Param("mobile") String mobile,
                                   @Param("idCard") String idCard, @Param("povertyType") String povertyType,
-                                  @Param("povertyStatus") Integer povertyStatus);
+                                  @Param("povertyStatus") Integer povertyStatus, @Param("orgIdPath") String orgPath);
 
     Boolean isExist(@Param("resiUserId") String resiUserId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java

@@ -55,4 +55,9 @@ public class PovertyCondoleEntity extends BaseEpmetEntity {
      */
 	private String remark;
 
+	/**
+	 * 组织ID路径
+	 */
+	private String orgIdPath;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java

@@ -6,56 +6,59 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- *
- *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2023-06-16
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("poverty_manage")
 public class PovertyManageEntity extends BaseEpmetEntity {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 居民ID
      */
-	private String resiUserId;
+    private String resiUserId;
 
     /**
      * 组织ID
      */
-	private String agencyId;
+    private String agencyId;
 
     /**
      * 网格ID
      */
-	private String gridId;
+    private String gridId;
+
+	/**
+	 * 行政组织ID路径
+	 */
+	private String orgIdPath;
 
     /**
      * 姓名
      */
-	private String userName;
+    private String userName;
 
     /**
      * 电话
      */
-	private String mobile;
+    private String mobile;
 
     /**
      * 身份证号码
      */
-	private String idCard;
+    private String idCard;
 
     /**
      * 贫困属性
      */
-	private String povertyType;
+    private String povertyType;
 
     /**
      * 脱贫状态
      */
-	private Integer povertyStatus;
+    private Integer povertyStatus;
 
 }

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

@@ -12,8 +12,10 @@ import com.epmet.dao.PovertyCondoleDao;
 import com.epmet.dto.PovertyCondoleDTO;
 import com.epmet.dto.form.povertyManage.PovertyCondoleAttrDTO;
 import com.epmet.dto.form.povertyManage.PovertyCondoleFormDto;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.entity.PovertyCondoleAttrEntity;
 import com.epmet.entity.PovertyCondoleEntity;
+import com.epmet.remote.EpmetUserRemoteService;
 import com.epmet.service.PovertyCondoleService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -40,6 +42,9 @@ import java.util.Map;
 public class PovertyCondoleServiceImpl extends BaseServiceImpl<PovertyCondoleDao, PovertyCondoleEntity> implements PovertyCondoleService {
 
 
+    @Resource
+    private EpmetUserRemoteService remoteService;
+
     @Resource
     private PovertyCondoleAttrDao attrDao;
 
@@ -60,8 +65,11 @@ public class PovertyCondoleServiceImpl extends BaseServiceImpl<PovertyCondoleDao
 
     private QueryWrapper<PovertyCondoleEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
+        LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails();
+        String orgIdPath = userDetails.getOrgIdPath();//社区级别的orgIdPath
         QueryWrapper<PovertyCondoleEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.likeRight(StringUtils.isNotBlank(orgIdPath), "ORG_ID_PATH", orgIdPath);
         return wrapper;
     }
 
@@ -78,6 +86,9 @@ public class PovertyCondoleServiceImpl extends BaseServiceImpl<PovertyCondoleDao
         if (StringUtils.isNotEmpty(dto.getCondoleTime())) {
             entity.setCondoleTime(new SimpleDateFormat("yyyy-MM-dd").parse(dto.getCondoleTime()));
         }
+        LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails();
+        String orgIdPath = userDetails.getOrgIdPath();//社区级别的orgIdPath
+        entity.setOrgIdPath(orgIdPath);
         insert(entity);
         if (!CollectionUtils.isEmpty(dto.getImgs())) {
             buildImgs(dto.getImgs(), entity.getId());
@@ -104,9 +115,11 @@ public class PovertyCondoleServiceImpl extends BaseServiceImpl<PovertyCondoleDao
 
     @Override
     public PageData<PovertyCondoleDTO> search(PovertyCondoleFormDto formDto) {
+        LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails();
+        String orgIdPath = userDetails.getOrgIdPath();//社区级别的orgIdPath
         PageInfo<PovertyCondoleDTO> pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage())
                 .doSelectPageInfo(() -> baseDao.search(formDto.getUserName(), formDto.getIdCard(), formDto.getCondoleStaff(), formDto.getPovertyType(),
-                        formDto.getPovertyStatus(), formDto.getContent(), formDto.getStartTime(), formDto.getEndTime()));
+                        formDto.getPovertyStatus(), formDto.getContent(), formDto.getStartTime(), formDto.getEndTime(), orgIdPath));
         return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal());
     }
 

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

@@ -10,6 +10,7 @@ import com.epmet.dao.PovertyManageDao;
 import com.epmet.dto.PovertyManageDTO;
 import com.epmet.dto.form.povertyManage.PovertyManageFormDto;
 import com.epmet.entity.PovertyManageEntity;
+import com.epmet.remote.EpmetUserRemoteService;
 import com.epmet.service.PovertyManageService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -17,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -29,6 +31,9 @@ import java.util.Map;
 @Service
 public class PovertyManageServiceImpl extends BaseServiceImpl<PovertyManageDao, PovertyManageEntity> implements PovertyManageService {
 
+    @Resource
+    private EpmetUserRemoteService remoteService;
+
     @Override
     public PageData<PovertyManageDTO> page(Map<String, Object> params) {
         IPage<PovertyManageEntity> page = baseDao.selectPage(
@@ -46,8 +51,10 @@ public class PovertyManageServiceImpl extends BaseServiceImpl<PovertyManageDao,
 
     private QueryWrapper<PovertyManageEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
+        String orgPath = remoteService.getLoginUserDetails().getOrgIdPath();
         QueryWrapper<PovertyManageEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.likeRight(StringUtils.isNotBlank(orgPath), "ORG_ID_PATH", orgPath);
         return wrapper;
     }
 
@@ -60,7 +67,9 @@ public class PovertyManageServiceImpl extends BaseServiceImpl<PovertyManageDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PovertyManageFormDto dto) {
+        String orgPath = remoteService.getLoginUserDetails().getOrgIdPath();
         PovertyManageEntity entity = ConvertUtils.sourceToTarget(dto, PovertyManageEntity.class);
+        entity.setOrgIdPath(orgPath);
         insert(entity);
     }
 
@@ -80,8 +89,9 @@ public class PovertyManageServiceImpl extends BaseServiceImpl<PovertyManageDao,
 
     @Override
     public PageData<PovertyManageDTO> search(PovertyManageFormDto formDto) {
+        String orgPath = remoteService.getLoginUserDetails().getOrgIdPath();
         PageInfo<PovertyManageDTO> pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage())
-                .doSelectPageInfo(() -> baseDao.search(formDto.getUserName(), formDto.getMobile(), formDto.getIdCard(), formDto.getPovertyType(), formDto.getPovertyStatus()));
+                .doSelectPageInfo(() -> baseDao.search(formDto.getUserName(), formDto.getMobile(), formDto.getIdCard(), formDto.getPovertyType(), formDto.getPovertyStatus(), orgPath));
         return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal());
     }
 

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

@@ -12,6 +12,7 @@
         <result property="condoleStaff" column="CONDOLE_STAFF"/>
         <result property="content" column="CONTENT"/>
         <result property="remark" column="REMARK"/>
+        <result property="orgIdPath" column="ORG_ID_PATH"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -38,7 +39,7 @@
         FROM poverty_condole pc
         LEFT JOIN poverty_manage pm ON pc.POVERTY_ID = pm.ID
         <where>
-            pc.DEL_FLAG = 0
+            pc.DEL_FLAG = 0 AND pc.ORG_ID_PATH LIKE concat(#{orgIdPath},'%')
             <if test="null != content and content != ''">
                 AND pc.CONTENT LIKE concat( '%', #{content}, '%')
             </if>

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

@@ -8,6 +8,7 @@
         <result property="resiUserId" column="RESI_USER_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>
         <result property="gridId" column="GRID_ID"/>
+        <result property="orgIdPath" column="ORG_ID_PATH"/>
         <result property="userName" column="USER_NAME"/>
         <result property="mobile" column="MOBILE"/>
         <result property="idCard" column="ID_CARD"/>
@@ -36,7 +37,7 @@
         <include refid="returnMap"/>
         FROM poverty_manage pm
         <where>
-            pm.DEL_FLAG = 0
+            pm.DEL_FLAG = 0 AND pm.ORG_ID_PATH LIKE concat(#{orgIdPath}, '%')
             <if test="null != userName and userName != ''">
                 AND pm.USER_NAME LIKE concat( '%', #{userName}, '%')
             </if>
@@ -54,6 +55,7 @@
             </if>
         </where>
     </select>
+
     <select id="isExist" resultType="java.lang.Boolean">
         select count(pm.id) FROM poverty_manage pm
         where pm.DEL_FLAG = 0