From 96cd029990da8189f0178713f935b6951c2ac0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 29 Dec 2023 14:16:59 +0800 Subject: [PATCH 1/3] 'commit' --- .../dsideal/QingLong/Collect/Controller/CollectController.java | 1 - .../java/com/dsideal/QingLong/Collect/Model/CollectModel.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 4a185305..dd1bb3be 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -852,7 +852,6 @@ public class CollectController extends Controller { } } - /** * 功能：学校（单位）查看我该填报或者我已填报的任务列表 * diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index bebadee1..a2a44187 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -823,7 +823,7 @@ public class CollectModel { bureauSet.add(s); } } - + if (group_id > 0) { List list = getGroup(group_id); for (Record record : list) { From 5628fc5c93731307019a24b6fbead7b6e241acd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 29 Dec 2023 14:31:06 +0800 Subject: [PATCH 2/3] 'commit' --- .../QingLong/Collect/Controller/CollectController.java | 4 ++-- .../java/com/dsideal/QingLong/Collect/Model/CollectModel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index dd1bb3be..202ef9ec 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/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 { - cm.publishJob(job_id, deadline_time, shiZhiSchool, shiZhiJiaoFu, quXiaoJiaoYuJu, bureauIds,group_id); + int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds, String groupIds) throws ParseException { + cm.publishJob(job_id, deadline_time, shiZhiSchool, shiZhiJiaoFu, quXiaoJiaoYuJu, bureauIds,groupIds); Map map = new HashMap<>(); map.put("success", true); map.put("message", "保存成功!"); diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index a2a44187..76c891cd 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/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 bureauSet = new HashSet<>(); if (shiZhiSchool == 1) { Page list = getBureauList(9, null, 1, 9999); From 467a8e39b72085edd9236edbd991781c6d7b2165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 29 Dec 2023 14:32:22 +0800 Subject: [PATCH 3/3] 'commit' --- .../dsideal/QingLong/Collect/Model/CollectModel.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 89b97d46..690a1965 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -817,17 +817,17 @@ public class CollectModel { bureauSet.add(record.getStr("org_id")); } } - if (!StrKit.isBlank(bureauIds)) { for (String s : bureauIds.split(",")) { bureauSet.add(s); } } - - if (group_id > 0) { - List list = getGroup(group_id); - for (Record record : list) { - bureauSet.add(record.getStr("bureau_id")); + if (groupIds.length() > 0) { + for (String group_id : groupIds.split(",")) { + List list = getGroup(Integer.parseInt(group_id)); + for (Record record : list) { + bureauSet.add(record.getStr("bureau_id")); + } } } //写主表