diff --git a/src/main/java/com/spring/modules/lab/service/impl/LabServiceImpl.java b/src/main/java/com/spring/modules/lab/service/impl/LabServiceImpl.java index 8c1c6286..e228ddc3 100644 --- a/src/main/java/com/spring/modules/lab/service/impl/LabServiceImpl.java +++ b/src/main/java/com/spring/modules/lab/service/impl/LabServiceImpl.java @@ -171,6 +171,13 @@ public class LabServiceImpl extends ServiceImpl implements if (StringUtils.isBlank(userName)) { throw new RuntimeException("下达人不能为空"); } + String creator = StringUtils.trimToEmpty(lab.getCreateBy()); + if (StringUtils.isBlank(creator)) { + creator = StringUtils.trimToEmpty(lab.getApplicant()); + } + if (!StringUtils.equals(StringUtils.trimToEmpty(userName), creator)) { + throw new RuntimeException("只能下达自己发起的申请!"); + } if (StringUtils.isBlank(menuId)) { throw new RuntimeException("菜单ID不能为空"); } diff --git a/src/main/resources/mapper/part/WorkCenterMapper.xml b/src/main/resources/mapper/part/WorkCenterMapper.xml index 538462c6..7e658d8f 100644 --- a/src/main/resources/mapper/part/WorkCenterMapper.xml +++ b/src/main/resources/mapper/part/WorkCenterMapper.xml @@ -22,7 +22,7 @@ wc.pro_line_no, wc.can_create_new_roll_flag, wc.need_setup_flag - from dbo.work_center wc where site = #{site} and active = 'Y' + from dbo.work_center wc where site = #{site} and show_in_query_flag = 'Y' and wc.work_center_no = #{workCenterNo}