diff --git a/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java b/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java index d93d1418..5626c6f2 100644 --- a/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java +++ b/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java @@ -262,6 +262,11 @@ public class ErfExpApplyData implements Serializable { private String pendingStatus; + /** + * 是否为工程实验申请管理员(true=管理员可查看所有待办) + */ + private Boolean isAdmin; + /** * 下达时间 */ diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java index d57db58d..a8dac5a8 100644 --- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java @@ -434,6 +434,15 @@ public class ErfExpApplyServiceImpl extends ServiceImpl adminRoles = sysUserDao.getUserRolesByRoleNames( + data.getCurrentUserId(), List.of("工程实验申请管理员")); + if (!adminRoles.isEmpty()) { + data.setIsAdmin(true); + } + } + PageHelper.startPage(data.getPage(), data.getLimit()); List list = erfExpApplyMapper.getPendingApplyList(data); PageInfo pageInfo = new PageInfo<>(list); @@ -960,7 +969,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl - n.assignee_user_id = #{data.currentUserId} - AND n.status = '待审核' + + n.assignee_user_id = #{data.currentUserId} + AND + + n.status = '待审核' AND n.node_code IN ('技术经理审批', '生产经理审批', '质量经理审批')