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