Browse Source

filter delflag=1

dengjia 3 tháng trước cách đây
mục cha
commit
4e92a095da

+ 2 - 1
.gitignore

@@ -62,4 +62,5 @@ gen_code
 node_modules
 
 ### oneself ###
-.idea/
+.idea/
+.vscode/

+ 1 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysArchiveManager.java

@@ -1013,6 +1013,7 @@ public class SysArchiveManager {
 
     return taskSupervisionAdviceService.list(
         Wrappers.<WmTaskSupervisionAdvice>lambdaQuery()
+            .eq(WmTaskSupervisionAdvice::getDelFlag, false)
             .in(WmTaskSupervisionAdvice::getTaskSupervisionId, collect));
   }
 

+ 2 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1932,6 +1932,7 @@ public class WmSupervisionManager {
             List<WmTaskSupervisionAdvice> advices =
                 taskSupervisionAdviceService.list(
                     Wrappers.<WmTaskSupervisionAdvice>lambdaQuery()
+                        .eq(WmTaskSupervisionAdvice::getDelFlag, false)
                         .eq(
                             WmTaskSupervisionAdvice::getTaskSupervisionId,
                             wmTaskSupervision.getSupervisionId()));
@@ -2174,6 +2175,7 @@ public class WmSupervisionManager {
         taskSupervisionAdviceService
             .list(
                 Wrappers.<WmTaskSupervisionAdvice>lambdaQuery()
+                    .eq(WmTaskSupervisionAdvice::getDelFlag, false)
                     .in(WmTaskSupervisionAdvice::getTaskSupervisionId, supIds))
             .stream()
             .collect(Collectors.groupingBy(WmTaskSupervisionAdvice::getTaskSupervisionId));