增加数据隔离

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInterviewDao.java

@@ -20,5 +20,5 @@ public interface EnterpriseInterviewDao extends BaseDao<EnterpriseInterviewEntit
     List<EnterpriseInterviewDTO> search(@Param("unitName") String unitName, @Param("staffs") String staffs,
                                         @Param("startTime") String startTime, @Param("endTime") String endTime,
                                         @Param("interviewType") String interviewType, @Param("problem") String problem,
-                                        @Param("remark") String remark);
+                                        @Param("remark") String remark, @Param("ids") List<String> ids);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInvestigateDao.java

@@ -19,5 +19,6 @@ public interface EnterpriseInvestigateDao extends BaseDao<EnterpriseInvestigateE
 
     List<EnterpriseInvestigateDTO> search(@Param("unitName") String unitName, @Param("title") String title,
                                           @Param("startTime") String startTime, @Param("endTime") String endTime,
-                                          @Param("consequence") String consequence, @Param("remark") String remark);
+                                          @Param("consequence") String consequence, @Param("remark") String remark,
+                                          @Param("ids") List<String> ids);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java

@@ -15,6 +15,6 @@ import java.util.List;
 @Mapper
 public interface KeyEnterpriseDao extends BaseDao<KeyEnterpriseEntity> {
 
-    List<KeyEnterpriseDTO> search(@Param("unitName") String unitName, @Param("unitType") String unitType);
+    List<KeyEnterpriseDTO> search(@Param("unitName") String unitName, @Param("unitType") String unitType, @Param("orgIdPath") String orgIdPath);
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java

@@ -58,4 +58,9 @@ public class KeyEnterpriseEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+	/**
+	 * 组织ID路径
+	 */
+	private String orgIdPath;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInterviewServiceImpl.java

@@ -8,12 +8,16 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.EnterpriseInterviewDao;
 import com.epmet.dto.EnterpriseInterviewDTO;
+import com.epmet.dto.KeyEnterpriseDTO;
 import com.epmet.dto.form.EnterpriseInterviewFormDTO;
+import com.epmet.dto.form.KeyEnterpriseFormDTO;
 import com.epmet.entity.EnterpriseInterviewEntity;
 import com.epmet.service.EnterpriseInterviewService;
+import com.epmet.service.KeyEnterpriseService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 日照：企业走访
@@ -33,6 +38,9 @@ import java.util.Map;
 @Service
 public class EnterpriseInterviewServiceImpl extends BaseServiceImpl<EnterpriseInterviewDao, EnterpriseInterviewEntity> implements EnterpriseInterviewService {
 
+    @Autowired
+    private KeyEnterpriseService enterpriseService;
+
     @Override
     public PageData<EnterpriseInterviewDTO> page(Map<String, Object> params) {
         IPage<EnterpriseInterviewEntity> page = baseDao.selectPage(
@@ -93,9 +101,17 @@ public class EnterpriseInterviewServiceImpl extends BaseServiceImpl<EnterpriseIn
 
     @Override
     public PageData<EnterpriseInterviewDTO> search(EnterpriseInterviewFormDTO formDto) {
+        List<KeyEnterpriseDTO> enterprise = enterpriseService.search(new KeyEnterpriseFormDTO()).getList();
+        List<String> enterpriseIds;
+        if (null != enterprise && enterprise.size() > 0) {
+            enterpriseIds = enterprise.stream().map(enter -> enter.getId()).collect(Collectors.toList());
+        } else {
+            return new PageData<>(new ArrayList<>(), 0);
+        }
+        List<String> ids = enterpriseIds;
         PageInfo<EnterpriseInterviewDTO> pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage())
                 .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getStaffs(), formDto.getStartTime(), formDto.getEndTime(), formDto.getInterviewType(),
-                        formDto.getProblem(), formDto.getRemark()));
+                        formDto.getProblem(), formDto.getRemark(),ids));
         return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal());
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInvestigateServiceImpl.java

@@ -8,12 +8,16 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.EnterpriseInvestigateDao;
 import com.epmet.dto.EnterpriseInvestigateDTO;
+import com.epmet.dto.KeyEnterpriseDTO;
 import com.epmet.dto.form.EnterpriseInvestigateFormDTO;
+import com.epmet.dto.form.KeyEnterpriseFormDTO;
 import com.epmet.entity.EnterpriseInvestigateEntity;
 import com.epmet.service.EnterpriseInvestigateService;
+import com.epmet.service.KeyEnterpriseService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 日照：企业排查管理
@@ -33,6 +38,10 @@ import java.util.Map;
 @Service
 public class EnterpriseInvestigateServiceImpl extends BaseServiceImpl<EnterpriseInvestigateDao, EnterpriseInvestigateEntity> implements EnterpriseInvestigateService {
 
+
+    @Autowired
+    private KeyEnterpriseService enterpriseService;
+
     @Override
     public PageData<EnterpriseInvestigateDTO> page(Map<String, Object> params) {
         IPage<EnterpriseInvestigateEntity> page = baseDao.selectPage(
@@ -97,9 +106,17 @@ public class EnterpriseInvestigateServiceImpl extends BaseServiceImpl<Enterprise
 
     @Override
     public PageData<EnterpriseInvestigateDTO> search(EnterpriseInvestigateFormDTO formDto) {
+        List<KeyEnterpriseDTO> enterprise = enterpriseService.search(new KeyEnterpriseFormDTO()).getList();
+        List<String> enterpriseIds;
+        if (null != enterprise && enterprise.size() > 0) {
+            enterpriseIds = enterprise.stream().map(enter -> enter.getId()).collect(Collectors.toList());
+        } else {
+            return new PageData<>(new ArrayList<>(), 0);
+        }
+        List<String> ids = enterpriseIds;
         PageInfo<EnterpriseInvestigateDTO> pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage())
                 .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getTitle(), formDto.getStartTime(), formDto.getEndTime(),
-                        formDto.getConsequence(), formDto.getRemark()));
+                        formDto.getConsequence(), formDto.getRemark(), ids));
         return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal());
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java

@@ -9,7 +9,9 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.KeyEnterpriseDao;
 import com.epmet.dto.KeyEnterpriseDTO;
 import com.epmet.dto.form.KeyEnterpriseFormDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.entity.KeyEnterpriseEntity;
+import com.epmet.remote.EpmetUserRemoteService;
 import com.epmet.service.KeyEnterpriseService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -17,6 +19,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 +32,9 @@ import java.util.Map;
 @Service
 public class KeyEnterpriseServiceImpl extends BaseServiceImpl<KeyEnterpriseDao, KeyEnterpriseEntity> implements KeyEnterpriseService {
 
+    @Resource
+    private EpmetUserRemoteService remoteService;
+
     @Override
     public PageData<KeyEnterpriseDTO> page(Map<String, Object> params) {
         IPage<KeyEnterpriseEntity> page = baseDao.selectPage(
@@ -41,16 +47,16 @@ public class KeyEnterpriseServiceImpl extends BaseServiceImpl<KeyEnterpriseDao,
     @Override
     public List<KeyEnterpriseDTO> list(Map<String, Object> params) {
         List<KeyEnterpriseEntity> entityList = baseDao.selectList(getWrapper(params));
-
         return ConvertUtils.sourceToTarget(entityList, KeyEnterpriseDTO.class);
     }
 
     private QueryWrapper<KeyEnterpriseEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
-
+        String orgPath = remoteService.getLoginUserDetails().getOrgIdPath();
         QueryWrapper<KeyEnterpriseEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
+        wrapper.likeRight(StringUtils.isNotBlank(orgPath), "ORG_ID_PATH", orgPath);
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
         return wrapper;
     }
 
@@ -64,6 +70,9 @@ public class KeyEnterpriseServiceImpl extends BaseServiceImpl<KeyEnterpriseDao,
     @Transactional(rollbackFor = Exception.class)
     public void save(KeyEnterpriseFormDTO dto) {
         KeyEnterpriseEntity entity = ConvertUtils.sourceToTarget(dto, KeyEnterpriseEntity.class);
+        LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails();
+        String orgIdPath = userDetails.getOrgIdPath();//社区级别的orgIdPath
+        entity.setOrgIdPath(orgIdPath);
         insert(entity);
     }
 
@@ -83,8 +92,9 @@ public class KeyEnterpriseServiceImpl extends BaseServiceImpl<KeyEnterpriseDao,
 
     @Override
     public PageData<KeyEnterpriseDTO> search(KeyEnterpriseFormDTO formDto) {
+        String orgIdPath = remoteService.getLoginUserDetails().getOrgIdPath();
         PageInfo<KeyEnterpriseDTO> pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage())
-                .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getUnitType()));
+                .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getUnitType(), orgIdPath));
         return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal());
     }
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInterviewDao.xml

@@ -39,6 +39,12 @@
         LEFT JOIN key_enterprise ke ON ei.ENTERPRISE_ID = ke.ID
         <where>
             ei.DEL_FLAG = 0
+            <if test="null !=ids and ids.size > 0">
+                AND ei.ENTERPRISE_ID IN
+                <foreach collection="ids" item="id" separator="," open="(" close=")" index="">
+                    #{id}
+                </foreach>
+            </if>
             <if test="null != unitName and unitName !=''">
                 AND ke.UNIT_NAME LIKE concat( '%', #{unitName}, '%')
             </if>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInvestigateDao.xml

@@ -37,6 +37,12 @@
         LEFT JOIN key_enterprise ke ON ei.ENTERPRISE_ID = ke.ID
         <where>
             ei.DEL_FLAG = 0
+            <if test="null !=ids and ids.size > 0">
+                AND ei.ENTERPRISE_ID IN
+                <foreach collection="ids" item="id" separator="," open="(" close=")" index="">
+                    #{id}
+                </foreach>
+            </if>
             <if test="null != unitName and unitName !=''">
                 AND ke.UNIT_NAME LIKE concat( '%', #{unitName}, '%')
             </if>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml

@@ -13,6 +13,7 @@
         <result property="address" column="ADDRESS"/>
         <result property="longitude" column="LONGITUDE"/>
         <result property="latitude" column="LATITUDE"/>
+        <result property="orgIdPath" column="ORG_ID_PATH"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -36,7 +37,7 @@
         <include refid="returnMap"/>
         FROM key_enterprise ke
         <where>
-            ke.DEL_FLAG = 0
+            ke.DEL_FLAG = 0 AND ke.ORG_ID_PATH LIKE concat(#{orgIdPath},'%')
             <if test="null != unitName and unitName !=''">
                 AND ke.UNIT_NAME LIKE concat( '%', #{unitName}, '%')
             </if>