'commit'

src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java

@@ -3,6 +3,7 @@ package com.dsideal.QingLong.Base.Controller;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.QingLong.Base.Model.BaseModel;
 import com.dsideal.QingLong.Bean.TBaseOrgTypePrincipalship;
+import com.dsideal.QingLong.Handler.RepeatIntercetpor;
 import com.dsideal.QingLong.Interceptor.*;
 import com.dsideal.QingLong.Util.CommonUtil;
 import com.dsideal.QingLong.Util.ExcelCommonUtil;
@@ -155,7 +156,7 @@ public class BaseController extends Controller {
      * @param is_school
      * @param code
      */
-    @Before({POST.class})
+    @Before({POST.class, RepeatIntercetpor.class})
     @EmptyInterface({"code", "name"})
     @IsNumericInterface({"parent_id", "sort_id"})
     @LengthInterface({"code,2,2", "name,2,32"})
@@ -189,7 +190,7 @@ public class BaseController extends Controller {
      *
      * @param id
      */
-    @Before({POST.class})
+    @Before({POST.class, RepeatIntercetpor.class})
     @IsNumericInterface({"id"})
     @IsSysAdminInterface({"1"})
     public void delOrgTypePrincipalshipById(int id) {
@@ -219,7 +220,7 @@ public class BaseController extends Controller {
      * @param code
      * @param is_school
      */
-    @Before({POST.class})
+    @Before({POST.class, RepeatIntercetpor.class})
     @EmptyInterface({"code", "name"})
     @IsNumericInterface({"id", "parent_id", "sort_id", "b_use"})
     @IsSysAdminInterface({"1"})

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

@@ -1176,21 +1176,21 @@ public class CollectController extends Controller {
      * 功能：获取指定任务指定单位的填报内容
      *
      * @param job_id
-     * @param bureau_id
+     * @param target_id
      */
     @Before({GET.class})
     @IsLoginInterface({})
     @IsNumericInterface({"job_id"})
-    public void getFormFillJob(int job_id, String bureau_id) {
-        if (StrKit.isBlank(bureau_id)) {
+    public void getFormFillJob(int job_id, String target_id) {
+        if (StrKit.isBlank(target_id)) {
             //操作人员
             String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
             //根据人员ID，获取人员所在的单位ID
             LoginPersonModel personModel = new LoginPersonModel();
             Record rs = personModel.getLoginInfoByPersonId(person_id);
-            bureau_id = rs.get("bureau_id");
+            target_id = rs.get("bureau_id");
         }
-        String json = cm.getFormFillJob(job_id, bureau_id);
+        String json = cm.getFormFillJob(job_id, target_id);
         renderJson(json);
     }
 

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

@@ -1326,11 +1326,13 @@ public class CollectModel {
      * 功能：获取指定任务指定单位的填报内容
      *
      * @param job_id
-     * @param bureau_id
+     * @param target_id
      */
     public String getFormFillJob(int job_id, String target_id) {
         String sql = "select form_fill_json from t_collect_job_target where target_id=? and job_id=?";
-        return Db.findFirst(sql, target_id, job_id).getStr("form_fill_json");
+        Record record = Db.findFirst(sql, target_id, job_id);
+        if (record == null) return "";
+        return record.getStr("form_fill_json");
     }
 
     /**