fix: secondary cso rule list 1

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeController.java

@@ -142,15 +142,16 @@ public class WmTaskTypeController {
      */
     @GetMapping("/page")
     public R<IPage<WmTaskTypeVO>> getWmTaskTypePage(Page<WmTaskType> page, WmTaskType wmTaskType) {
+
         List<String> noDisplayTaskTypeNameList =
                 Arrays.asList("专家咨询", "受试者管理",
                         "医学撰写", "受试者招募",
                         "数据管理", "统计分析",
                         "临床监察", "通用", "患者教育");
 
+        LambdaQueryWrapper<WmTaskType> queryWrapper = Wrappers.<WmTaskType>lambdaQuery();
 
         // 二级代理（查询一级cso）
-        Integer upId = null;
         if ("3".equals(wmTaskType.getStatus())) {
             HnqzUser user = SecurityUtils.getUser();
             // WmDaAgent one = wmDaAgentService.getOne(Wrappers.<WmDaAgent>lambdaQuery().eq(WmDaAgent::getDeptId, user.getDeptId()));
@@ -166,7 +167,9 @@ public class WmTaskTypeController {
 
             if (CollUtil.isNotEmpty(list)) {
                 WmRelation wmRelation = list.get(0);
-                upId = wmRelation.getUpId();
+                Integer upId = wmRelation.getUpId();
+                queryWrapper.isNull(WmTaskType::getDurgentId)
+                        .eq(upId != null, WmTaskType::getDeptId, upId);
             } else {
                 return R.failed("区域积分规则未设置");
             }
@@ -174,12 +177,11 @@ public class WmTaskTypeController {
 
         }
 
-        LambdaQueryWrapper<WmTaskType> queryWrapper = Wrappers.<WmTaskType>lambdaQuery()
-                .eq(StrUtil.isNotBlank(wmTaskType.getTaskTypeLevel()), WmTaskType::getTaskTypeLevel, wmTaskType.getTaskTypeLevel())
+
+        queryWrapper.eq(StrUtil.isNotBlank(wmTaskType.getTaskTypeLevel()), WmTaskType::getTaskTypeLevel, wmTaskType.getTaskTypeLevel())
                 .eq(wmTaskType.getRuleId() != null, WmTaskType::getRuleId, wmTaskType.getRuleId())
                 .eq(StrUtil.isNotBlank(wmTaskType.getTaskTypeName()), WmTaskType::getTaskTypeName, wmTaskType.getTaskTypeName())
                 .eq(StrUtil.isNotBlank(wmTaskType.getEnableFlag()), WmTaskType::getEnableFlag, wmTaskType.getEnableFlag())
-                .eq(upId != null, WmTaskType::getDeptId, upId)
                 .eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.getVal())
                 .notIn(WmTaskType::getTaskTypeName, noDisplayTaskTypeNameList);