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

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

@@ -665,12 +665,19 @@ public class CollectController extends Controller {
     /**
      * 功能：获取任务列表，支持关键字查询
      *
-     * @param selfOrNext 是不是看自己本单位:1,还是看下一级:2
+     * @param self_or_next 是不是看自己本单位:1,还是看下一级:2
      */
     @Before({GET.class})
     @IsLoginInterface({})
-    @IsNumericInterface({"selfOrNext"})
-    public void getJobList(String job_name, int selfOrNext, int page, int limit) throws ParseException {
+    @IsNumericInterface({"self_or_next"})
+    public void getJobList(String job_name, int self_or_next, int page, int limit) throws ParseException {
+        if (self_or_next != 1 && self_or_next != 2) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("success", false);
+            map.put("message", "self_or_next只能是1或者2，参数传入错误!");
+            renderJson(map);
+            return;
+        }
         //操作人员
         String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
         //检查当前登录人员是不是发布任务的角色
@@ -686,7 +693,7 @@ public class CollectController extends Controller {
 
         //获取登录人员第一个发布任务的角色是什么
         int publish_role_id = kvCheck.getInt("publish_role_id");
-        Page<Record> list = cm.getJobList(bureau_id, publish_role_id, selfOrNext, job_name, page, limit);
+        Page<Record> list = cm.getJobList(bureau_id, publish_role_id, self_or_next, job_name, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -1163,7 +1170,7 @@ public class CollectController extends Controller {
         }
 
         //通过检查
-        int job_id = cm.addFormJob(target_type_id, bureau_id, person_id, publish_role_id, job_name, table_name, json,self_or_next);
+        int job_id = cm.addFormJob(target_type_id, bureau_id, person_id, publish_role_id, job_name, table_name, json, self_or_next);
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");

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

@@ -736,19 +736,14 @@ public class CollectModel {
      * 功能：获取任务列表，支持关键字查询
      *
      * @param job_name
-     * @param selfOrNext 是不是看自己本单位:1,还是看下一级:2
+     * @param self_or_next 是不是看自己本单位:1,还是看下一级:2
      */
-    public Page<Record> getJobList(String bureau_id, int publish_role_id, int selfOrNext, String job_name, int page, int limit) throws ParseException {
+    public Page<Record> getJobList(String bureau_id, int publish_role_id, int self_or_next, String job_name, int page, int limit) throws ParseException {
         Kv kv = Kv.create();
         kv.set("bureau_id", bureau_id);
         kv.set("publish_role_id", publish_role_id);
         if (!StrKit.isBlank(job_name)) kv.set("job_name", job_name);
-        //selfOrNext
-        if (selfOrNext == 1) {
-            kv.set("selfOrNext1", 1);
-        } else if (selfOrNext == 2) {
-            kv.set("selfOrNext2", 1);
-        }
+        kv.set("self_or_next", self_or_next);
 
         SqlPara sqlPara = Db.getSqlPara("Collect.getJobList", kv);
 

src/main/resource/Sql/Collect.sql

@@ -13,12 +13,7 @@
         #if(job_name)
             and t1.job_name like #para(job_name, "like")
         #end
-        #if(selfOrNext1)
-            and (select count(1)  from t_collect_job_target as t2 where t2.current_target_type_id=1 and t2.job_id=t1.job_id)>0
-        #end
-        #if(selfOrNext2)
-            and  (select count(1) from t_collect_job_target as t2 where t2.current_target_type_id=2 and t2.job_id=t1.job_id)>0
-        #end
+        and self_or_next=#para(self_or_next)
         order by t1.job_id desc
     #end