Эх сурвалжийг харах

feat: 待审核页面放开人员筛选 1

shc 5 сар өмнө
parent
commit
c74221e5f5

+ 5 - 5
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/TaskManager.java

@@ -766,12 +766,12 @@ public class TaskManager {
     Page<ToDirectCheck> checkPage = new Page<>(query.getCurrent(), query.getSize());
 
     // 获取当前操作人的审核记录
-    List<Integer> tIds =
-        listChecked(new Page<>(query.getCurrent(), query.getSize()), null);
+    List<Integer> tIds = Collections.emptyList();
+//        listChecked(new Page<>(query.getCurrent(), query.getSize()), null);
 
-    if (CollUtil.isEmpty(tIds)) {
-      return checkPage;
-    }
+//    if (CollUtil.isEmpty(tIds)) {
+//      return checkPage;
+//    }
 
     // 获取vendor
     List<Integer> vendorList = getVendorList(query.getVendorId(), user);

+ 6 - 4
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskV2Mapper.xml

@@ -114,10 +114,12 @@
     LEFT JOIN wm_score_package AS pkg ON pkg.id = t.score_package_id
     LEFT JOIN wm_score_package AS ppkg ON ppkg.id = pkg.relation_score_id
     <where>
-      t.id IN
-      <foreach collection="taskIds" item="tid" open="(" close=")" separator=",">
-        #{tid}
-      </foreach>
+      <if test="taskIds != null and taskIds.size > 0">
+        t.id IN
+        <foreach collection="taskIds" item="tid" open="(" close=")" separator=",">
+          #{tid}
+        </foreach>
+      </if>
       <if test="pkgIssueDate != null and pkgExpiryDate != null">
         AND pkg.start_time &gt;= #{pkgIssueDate} AND pkg.end_time &lt;= #{pkgExpiryDate}
       </if>