Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -705,8 +705,8 @@ public class CollectController extends Controller {
     @IsNumericInterface({"job_id", "shiZhiSchool", "shiZhiJiaoFu", "quXiaoJiaoYuJu"})
     @EmptyInterface({"deadline_time"})
     public void publishJob(int job_id, String deadline_time, int shiZhiSchool,
-                           int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds, int group_id) throws ParseException {
+                           int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds, String groupIds) throws ParseException {
-        cm.publishJob(job_id, deadline_time, shiZhiSchool, shiZhiJiaoFu, quXiaoJiaoYuJu, bureauIds,group_id);
+        cm.publishJob(job_id, deadline_time, shiZhiSchool, shiZhiJiaoFu, quXiaoJiaoYuJu, bureauIds,groupIds);
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
@@ -852,7 +852,6 @@ public class CollectController extends Controller {
         }
     }
 
-
     /**
      * 功能：学校（单位）查看我该填报或者我已填报的任务列表
      *

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -797,7 +797,7 @@ public class CollectModel {
      * @param bureauIds      按单位选择的单位ids
      */
     public void publishJob(int job_id, String deadline_time, int shiZhiSchool,
-                           int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds, int group_id) throws ParseException {
+                           int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds, String groupIds) throws ParseException {
         Set<String> bureauSet = new HashSet<>();
         if (shiZhiSchool == 1) {
             Page<Record> list = getBureauList(9, null, 1, 9999);
@@ -817,19 +817,19 @@ public class CollectModel {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
-
         if (!StrKit.isBlank(bureauIds)) {
             for (String s : bureauIds.split(",")) {
                 bureauSet.add(s);
             }
         }
-        
+        if (groupIds.length() > 0) {
-        if (group_id > 0) {
+            for (String group_id : groupIds.split(",")) {
-            List<Record> list = getGroup(group_id);
+                List<Record> list = getGroup(Integer.parseInt(group_id));
                 for (Record record : list) {
                     bureauSet.add(record.getStr("bureau_id"));
                 }
             }
+        }
         //写主表
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = dateFormat.parse(deadline_time);