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

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

@@ -967,15 +967,15 @@ public class CollectController extends Controller {
      *                     1210 1211 单位 县   填报 待/已
      *                     2210 2211 人  县    填报 待/已
      *                     2310 2311 人  单位  填报 待/已
-     * @param direction    1:直发，2：转发
      */
     @Before({GET.class})
     @IsLoginInterface({})
     @IsNumericInterface({"job_id"})
     @LayUiPageInfoInterface({"page", "limit"})
     @EmptyInterface({"status_codes"})
-    public void viewJob(int job_id, String keyword, String status_codes, int page, int limit) {
-        Page<Record> list = cm.viewJob(job_id, keyword, status_codes, page, limit);
+    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);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -1155,7 +1155,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

@@ -1421,7 +1421,7 @@ public class CollectModel {
      * @param page
      * @param limit
      */
-    public Page<Record> viewJob(int job_id, String keyword, String status_codes, int page, int limit) {
+    public Page<Record> viewJob(int job_id, String keyword, String status_codes, int self_or_next, int page, int limit) {
         Kv kv = Kv.create();
         kv.set("job_id", job_id);
 
@@ -1439,8 +1439,7 @@ public class CollectModel {
         kv.set("idList", idList);
 
         SqlPara sqlPara;
-        int target_type_id = getJob(job_id).getInt("target_type_id");
-        if (target_type_id == 1) {
+        if (self_or_next == 2) {//看下级，出单位
             sqlPara = Db.getSqlPara("Collect.viewBureauJob", kv);
         } else {
             sqlPara = Db.getSqlPara("Collect.viewPersonJob", kv);