Procházet zdrojové kódy

选择记录校核主任时筛选部门

xy před 2 týdny
rodič
revize
7d914d6e2e

+ 6 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -5406,10 +5406,15 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             // 如果任务单只有一个检验员,将管道主任(角色标识 Pipeline Director)加入校核人列表
             if (orderUserDOList.size() == 1) {
                 try {
+                    // 获取任务单的部门ID,用于筛选同部门的管道主任
+                    PipeTaskOrderDO taskOrder = pipeTaskOrderMapper.selectById(pageReqVO.getOrderId());
+                    String orderDeptId = taskOrder != null ? taskOrder.getDeptId() : null;
+
                     List<AdminUserRespDTO> roleUsers = adminUserApi.getUserListByRoleCode("Pipeline Director").getCheckedData();
                     if (roleUsers != null) {
                         for (AdminUserRespDTO roleUser : roleUsers) {
-                            if (!uIds.contains(roleUser.getId())) {
+                            // 筛选部门ID与任务单部门ID相同的管道主任
+                            if (orderDeptId != null && orderDeptId.equals(roleUser.getDeptId()) && !uIds.contains(roleUser.getId())) {
                                 uIds.add(roleUser.getId());
                             }
                         }