From 65d64c98d7f8788e2335a480490a89bcb6dd439b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 26 Jan 2024 10:52:02 +0800
Subject: [PATCH] 'commit'

---
 .../QingLong/Collect/Controller/CollectController.java       | 5 ++---
 .../com/dsideal/QingLong/Collect/Model/CollectModel.java     | 4 ++--
 2 files changed, 4 insertions(+), 5 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 043d2dd8..b7574eeb 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
@@ -975,7 +975,7 @@ public class CollectController extends Controller {
     @EmptyInterface({"status_codes"})
     public void viewJob(int job_id, String keyword, String status_codes, int self_or_next, int page, int limit) {
         if (self_or_next == 0) self_or_next = 2;
-        Page<Record> list = cm.viewJob(job_id, keyword, status_codes, self_or_next,page, limit);
+        Page<Record> list = cm.viewJob(job_id, keyword, status_codes, self_or_next, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -1571,8 +1571,7 @@ public class CollectController extends Controller {
 
         //转发任务
         cm.ForwardJob(publish_role_id, area_id, job_id, status_code, deadline_time,
-                xiaShuSchool, xiaShuJiaoFu, bureauIds, groupIds, memo, bureau_id, person_id,
-                allTeacher, allStudent, njIds, personIds, classIds);
+                xiaShuSchool, xiaShuJiaoFu, bureauIds, groupIds, memo, bureau_id, allTeacher, allStudent, njIds, personIds, classIds);
         //返回
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
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 47bc09d6..ee574b40 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -1908,8 +1908,7 @@ public class CollectModel {
      * @param classIds        哪些班级
      */
     public void ForwardJob(int publish_role_id, String area_id, int job_id, int status_code, String deadline_time, int xiaShuSchool,
-                           int xiaShuJiaoFu, String bureauIds, String groupIds, String memo, String bureau_id, String person_id,
-                           int allTeacher, int allSutdent, String njIds, String personIds, String classIds) throws ParseException {
+                           int xiaShuJiaoFu, String bureauIds, String groupIds, String memo, String bureau_id, int allTeacher, int allSutdent, String njIds, String personIds, String classIds) throws ParseException {
         //获取此县区的所有学校
         Set<String> targetSet = new HashSet<>();
         if (xiaShuSchool == 1) {
@@ -2010,6 +2009,7 @@ public class CollectModel {
             record.set("target_id", s);
             record.set("bureau_id", bureau_id);
             record.set("status_code", next_status_code);
+            record.set("memo", memo);
             list.add(record);
         }
         Db.batchSave("t_collect_job_target", list, 500);