'commit'

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

@@ -1025,22 +1025,22 @@ public class CollectController extends Controller {
      * 功能：获取指定任务，指定单位上传的附件列表
      *
      * @param job_id
-     * @param bureau_id http://10.10.21.20:9000/QingLong/collect/getJobUploadList?job_id=42
+     * @param target_id http://10.10.21.20:9000/QingLong/collect/getJobUploadList?job_id=42
      */
     @Before({GET.class})
     @IsLoginInterface({})
     @IsNumericInterface({"job_id"})
-    public void getJobUploadList(int job_id, String bureau_id) {
+    public void getJobUploadList(int job_id, String target_id) {
         //如果不提供单位ID，那么默认值是当前操作人员所在单位,否则按提供为准
-        if (StrKit.isBlank(bureau_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");
         }
-        List<Record> list = cm.getJobUploadList(job_id, bureau_id);
+        List<Record> list = cm.getJobUploadList(job_id, target_id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -1445,12 +1445,12 @@ public class CollectModel {
      * 功能：获取指定任务，指定单位（人员）上传的附件列表
      *
      * @param job_id
-     * @param bureau_id
+     * @param target_id
      */
-    public List<Record> getJobUploadList(int job_id, String bureau_id) {
+    public List<Record> getJobUploadList(int job_id, String target_id) {
         Kv kv = Kv.create();
         kv.set("job_id", job_id);
-        if (!StrKit.isBlank(bureau_id)) kv.set("bureau_id", bureau_id);
+        if (!StrKit.isBlank(target_id)) kv.set("target_id", target_id);
         SqlPara sqlPara = Db.getSqlPara("Collect.getJobUploadList", kv);
         return Db.find(sqlPara);
     }

src/main/resource/Sql/Collect.sql

@@ -113,8 +113,8 @@
     -- 功能：获取指定任务，指定单位（人员）上传的附件列表
     #sql("getJobUploadList")
      select * from t_collect_uploadfile where job_id=#para(job_id)
-     #if(bureau_id)
-       and bureau_id=#para(bureau_id)
+     #if(target_id)
+       and target_id=#para(target_id)
      #end
      #if(person_id)
        and person_id=#para(person_id)