Selaa lähdekoodia

修复:审核模式为10的批量审核报错

QuYueTing 5 kuukautta sitten
vanhempi
commit
db6bf594f1

+ 2 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -2348,8 +2348,10 @@ public class ReportController {
         try {
             msg = reportService.batchApproveReport(ids, isDepartment, request,evaluate);
         } catch (NullPointerException e) {
+            e.printStackTrace();
             msg.setError("批量审核失败:NullPointerExp-"+e.getMessage());
         } catch (Exception e) {
+            e.printStackTrace();
             msg.setError("批量审核失败:"+e.getMessage());
         }
         return msg;

+ 1 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -3792,6 +3792,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     updateBatchById(updateReportList);
                 }
             } else if (timeType.getReportAuditType() == 10) {
+                allUsers = userMapper.selectList(new QueryWrapper<User>().select("id, name, department_id").eq("company_id", company.getId()));
                 //项目经理或者公司副总审核;直接审核通过
                 boolean hasAuditAllPri = sysFunctionService.hasPriviledge(user.getRoleId(), "审核全员日报");
                 List<Report> updateReportList = new ArrayList<>();

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 14 - 14
fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/customerNew.html