'commit'

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

@@ -568,13 +568,6 @@ public class CollectController extends Controller {
                     }
                 }
 
-//                int sheet_index = 1;
-//                int row_index = 3;
-//                int col_index = 7;
-//                XSSFCell cell2 = wb.getSheetAt(sheet_index).getRow(row_index).getCell(col_index);
-//                Object value2 = PoiUtil.getValue(cell2);
-//                System.out.println(value2);
-
                 // 检查数据类型是不是和规定的不兼容
                 for (int j = data_start_row; j <= lastRowNum; j++) {//行
                     XSSFCell cell = sheet.getRow(j).getCell(excel_column_idx);
@@ -587,8 +580,7 @@ public class CollectController extends Controller {
                         PoiUtil.addComment(wb, cell, "要求是小数，实际数据类型不是小数！");
                         PoiUtil.fillColor(wb, cell, IndexedColors.YELLOW.getIndex());
                         flag = false;
-                    }
-                    else if (column_type.equals("Date")) {//要求是日期，实际不是日期
+                    } else if (column_type.equals("Date")) {//要求是日期，实际不是日期
                         if (!CommonUtil.isDate(obj.toString())) {
                             PoiUtil.addComment(wb, cell, "要求是日期格式，实际数据类型不是日期格式！");
                             PoiUtil.fillColor(wb, cell, IndexedColors.YELLOW.getIndex());
@@ -792,8 +784,15 @@ public class CollectController extends Controller {
     @Before({GET.class})
     @IsLoginInterface({})
     @IsNumericInterface({"job_id", "type_id"})
-    @EmptyInterface({"bureau_id"})
     public void getJobBureauFillInfo(int job_id, String bureau_id, int type_id) throws Exception {
+        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");
+        }
         // 获取任务名称
         String job_name = cm.getJob(job_id).getStr("job_name");
         // 获取单位名称
@@ -804,6 +803,7 @@ public class CollectController extends Controller {
         String excel_filename = job_name + "【" + bureau_name + "】.xlsx";
         String pdf_filename = job_name + "【" + bureau_name + "】.pdf";
 
+
         //1、找到upload_excel_filename_user
         Record record = cm.viewFilledJob(job_id, bureau_id);
         String upload_excel_filename_user = record.getStr("upload_excel_filename_user");