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 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); 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 @@ and date_format(SUBMIT_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} + + and find_in_set(#{deptId},ALL_DEPT_IDS) + order by CREATED_TIME desc