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

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

@@ -1074,8 +1074,15 @@ public class CollectController extends Controller {
     @Before({GET.class})
     @IsLoginInterface({})
     @IsNumericInterface({"job_id"})
-    @EmptyInterface({"bureau_id"})
     public void getFormFillJob(int job_id, String bureau_id) {
+        if (StrKit.isBlank(bureau_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");
+        }
         Record record = cm.getFormFillJob(job_id, bureau_id);
         renderJson(record);
     }