综合查询加上下发单位

src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java

@@ -1,5 +1,6 @@
 package com.biutag.supervision.pojo.param;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
@@ -104,5 +105,13 @@ public class NegativeQueryParam extends BasePage {
     @Schema(description = "问题类型")
     private List<String> threeLevelCode;
 
+    @Schema(description = "下发单位id")
+    @TableField("issuingDepartId")
+    private String issuingDepartId;
+
+    @Schema(description = "下发单位名字")
+    @TableField("issuingDepartName")
+    private String issuingDepartName;
+
 
 }

src/main/java/com/biutag/supervision/pojo/vo/NegativeQueryVo.java

@@ -1,6 +1,8 @@
 package com.biutag.supervision.pojo.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -192,5 +194,11 @@ public class NegativeQueryVo {
     // 整改情况
     private String rectifyDesc;
 
+    @Schema(description = "下发单位id")
+    @TableField("issuingDepartId")
+    private String issuingDepartId;
 
+    @Schema(description = "下发单位名字")
+    @TableField("issuingDepartName")
+    private String issuingDepartName;
 }

src/main/java/com/biutag/supervision/service/NegativeQueryService.java

@@ -173,6 +173,10 @@ public class NegativeQueryService {
                 });
             }
         }
+        if (StrUtil.isNotBlank(param.getIssuingDepartId())){
+            List<String> allNodeIds = departService.getAllNodeIds(param.getIssuingDepartId());
+            queryWrapper.in(Negative::getIssuingDepartId, allNodeIds);
+        }
         if (CollectionUtil.isNotEmpty(param.getThreeLevelCode())){
             String codes = param.getThreeLevelCode().stream()
                     .map(code -> "'" + code + "'")