From 703bc38f6044d02f59b60b33d302443eda9fbf73 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 8 Dec 2020 17:24:19 +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=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=9D=83=E9=99=90=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 --- .../elink/esua/epdc/dto/SubPositionCheckInfoDTO.java | 6 ++++++ .../impl/SubPositionCheckInfoServiceImpl.java | 12 ++++++++++++ .../resources/mapper/SubPositionCheckInfoDao.xml | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java index 753d307be..388425cf4 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java @@ -119,4 +119,10 @@ public class SubPositionCheckInfoDTO implements Serializable { */ private Date updatedTime; + + /** + * 是否展示删除按钮 + */ + private Boolean delShow; + } \ No newline at end of file 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 08c70d4fb..c16ad26bd 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 @@ -33,6 +33,7 @@ import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity; import com.elink.esua.epdc.redis.SubPositionCheckInfoRedis; import com.elink.esua.epdc.service.SubAuditRecordsLogService; import com.elink.esua.epdc.service.SubPositionCheckInfoService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,6 +51,7 @@ import java.util.Map; * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-07 */ +@Slf4j @Service public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl implements SubPositionCheckInfoService { @@ -61,8 +63,18 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl page(Map params) { + log.info("1:"+SecurityUser.getUser().getId()); + log.info("2:"+SecurityUser.getUserId()); + String userId = SecurityUser.getUser().getId().toString(); IPage page = getPage(params); List list = baseDao.getSubPositionList(params); + for(SubPositionCheckInfoDTO spc : list){ + if (StringUtils.isNotBlank(spc.getCreatedBy()) && spc.getCreatedBy().equals(userId) && "1".equals(spc.getStatus())){ + spc.setDelShow(true); + }else{ + spc.setDelShow(false); + } + } return new PageData<>(list, page.getTotal()); } 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 5651bdae3..f3df403f3 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 @@ -35,7 +35,8 @@ END as statusName, APPROVAL_DEPT_NAME, - APPROVAL_TIME + APPROVAL_TIME, + CREATED_BY from epdc_sub_position_check_info where DEL_FLAG=0