From cd53b74a29f37424a9637cbb9ee22e22c1c797f4 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 10 Dec 2020 13:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=8C=96=E8=BF=90=E4=BD=9C=E3=80=91-=E3=80=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=85=A8=E7=BA=BF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12/10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SubPositionCheckInfoServiceImpl.java    | 16 +---------------
 .../resources/mapper/SubPositionCheckInfoDao.xml | 13 +++++--------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
index bbdbcf9be..23b228d83 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
@@ -28,11 +28,9 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SubPositionCheckInfoDao;
 import com.elink.esua.epdc.dto.SubPositionCheckInfoDTO;
-import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.form.FirstTrialFormDTO;
 import com.elink.esua.epdc.entity.SubInfoGridRelationEntity;
 import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity;
-import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.SubPositionCheckInfoRedis;
 import com.elink.esua.epdc.service.KpiGridEntityService;
 import com.elink.esua.epdc.service.SubAuditRecordsLogService;
@@ -69,25 +67,13 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
     @Autowired
     private SubInfoGridRelationService subInfoGridRelationService;
 
-    @Autowired
-    private AdminFeignClient adminFeignClient;
-
     @Autowired
     private KpiGridEntityService kpiGridEntityService;
 
     @Override
     public PageData<SubPositionCheckInfoDTO> page(Map<String, Object> params) {
         String userId = SecurityUser.getUser().getId().toString();
-        log.info("用户信息："+SecurityUser.getUser().getTypeKey());
-        Long deptId = SecurityUser.getUser().getDeptId();
-        // 查询机构类型键值
-        Result<SysDeptDTO> result = adminFeignClient.get(deptId);
-        SysDeptDTO sysDeptDTO = result.getData();
-        if(sysDeptDTO == null){
-            throw new RenException("未查到机构类型信息！");
-        }
-        params.put("typeKey",sysDeptDTO.getTypeKey());
-        params.put("sysDeptId",deptId);
+        params.put("deptIdList",SecurityUser.getUser().getDeptIdList());
 
         IPage<SubPositionCheckInfoDTO> page = getPage(params);
         List<SubPositionCheckInfoDTO> list = baseDao.getSubPositionList(params);
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
index 55385d213..af54cf19e 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
@@ -48,14 +48,11 @@
               <if test="deptId != null and deptId != ''">
                   and find_in_set(#{deptId},ALL_DEPT_IDS)
               </if>
-              <if test="typeKey == 'grid_party' || typeKey == 'community_party'">
-                  and DEPT_ID=#{sysDeptId}
-              </if>
-              <if test="typeKey == 'street_party'">
-                  and find_in_set(#{sysDeptId},ALL_DEPT_IDS)
-              </if>
-              <if test="typeKey == 'district_party' || typeKey == 'district_dept'">
-                  and STATUS = 2
+              <if test="deptIdList != null and  deptIdList.size()>0">
+                  AND  DEPT_ID IN
+                  <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                      #{deptId}
+                  </foreach>
               </if>
         order by CREATED_TIME desc
     </select>