From b13973ae23d7e545090b16d66c8305455384b01d Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 8 Dec 2020 18:53:51 +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=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?=
 =?UTF-8?q?=EF=BC=89-2020/12/8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/SubPositionCheckInfoServiceImpl.java     | 1 +
 .../src/main/resources/mapper/SubPositionCheckInfoDao.xml      | 3 +++
 2 files changed, 4 insertions(+)

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 c16ad26bd..8965aa12c 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
@@ -68,6 +68,7 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
         String userId = SecurityUser.getUser().getId().toString();
         IPage<SubPositionCheckInfoDTO> page = getPage(params);
         List<SubPositionCheckInfoDTO> list = baseDao.getSubPositionList(params);
+        //设置删除按钮展示权限：自己只能删自己的，状态为已提交的
         for(SubPositionCheckInfoDTO spc : list){
             if (StringUtils.isNotBlank(spc.getCreatedBy()) && spc.getCreatedBy().equals(userId) && "1".equals(spc.getStatus())){
                 spc.setDelShow(true);
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 f3df403f3..c49d64f0f 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
@@ -45,6 +45,9 @@
               <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                   and date_format(SUBMIT_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
               </if>
+              <if test="deptId != null and deptId != ''">
+                  and find_in_set(#{deptId},ALL_DEPT_IDS)
+              </if>
         order by CREATED_TIME desc
     </select>