'commit'

src/main/java/Tools/ClearGtzz.java

@@ -1,6 +1,8 @@
 package Tools;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.QingLong.Const.GtzzConst;
+import com.dsideal.QingLong.Gtzz.Model.GtzzModel;
 import com.dsideal.QingLong.Start;
 import com.dsideal.QingLong.Util.CommonUtil;
 import com.dsideal.QingLong.Util.PgSqlUtil;
@@ -43,8 +45,17 @@ public class ClearGtzz {
         String[] array = str.split("\n");
 
         for (int i = 0; i < array.length; i++) {
-            System.out.println("正在执行清空表:"+array[i].replace("\r",""));
-            PgSqlUtil.Truncate(array[i].replace("\r",""));
+            System.out.println("正在执行清空表:" + array[i].replace("\r", ""));
+            PgSqlUtil.Truncate(array[i].replace("\r", ""));
         }
+
+        //增加两个默认的验收任务
+        GtzzModel gm = new GtzzModel();
+        int id = gm.addYs("【初审专家分配系统保留任务】", "0203"); //为“技术方案初审” 服务
+        System.out.println("添加默认验收任务，id为：" + id);
+        gm.saveYsExpert(id, GtzzConst.DEFAULT_EXPERT, GtzzConst.DEFAULT_EXPERT);
+        id = gm.addYs("【验收专家分配系统保留任务】", "0307"); //为"市级验收"服务
+        gm.saveYsExpert(id, GtzzConst.DEFAULT_EXPERT, GtzzConst.DEFAULT_EXPERT);
+        System.out.println("添加默认验收任务，id为：" + id);
     }
 }

src/main/java/com/dsideal/QingLong/Const/GtzzConst.java

@@ -0,0 +1,6 @@
+package com.dsideal.QingLong.Const;
+
+public class GtzzConst {
+    //默认专家唯一标识
+    public static String DEFAULT_EXPERT = "4F4046D0-5B22-4EE6-BC95-6C7270313A42";
+}

src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java

@@ -2892,9 +2892,14 @@ public class GtzzModel {
         for (Record record : listSubject) {
             ids += record.getInt("subject_id") + ",";
         }
-        ids = ids.substring(0, ids.length() - 1);
-        String sql = "select * from t_gtzz_subject  where subject_id in (" + ids + ")";
-        return Db.find(sql);
+        if (!ids.isEmpty()) {
+            ids = ids.substring(0, ids.length() - 1);
+            String sql = "select * from t_gtzz_subject  where subject_id in (" + ids + ")";
+            return Db.find(sql);
+        } else {
+            return new ArrayList<>();
+        }
+
     }