|
@@ -1861,7 +1861,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
List<Integer> projectIds = reportList.stream().map(Report::getProjectId).collect(Collectors.toList());
|
|
|
|
|
|
List<ProjectProfession> myProfessionList = projectProfessionMapper.selectList(new QueryWrapper<ProjectProfession>().eq("incharger_id", user.getId()).in("project_id", projectIds));
|
|
|
- if (myProfessionList.size() == 0) {
|
|
|
+ if (myProfessionList.size() == 0 && !user.getRoleName().equals("超级管理员")) {
|
|
|
//httpRespMsg.setError("只有专业负责人才能进行专业审核");
|
|
|
httpRespMsg.setError(MessageUtils.message("finance.masterProfessional"));
|
|
|
return httpRespMsg;
|
|
@@ -1870,8 +1870,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
oneReport = reportList.get(0);
|
|
|
ReportProfessionProgress item = new ReportProfessionProgress();
|
|
|
item.setAuditState(1);
|
|
|
- reportProfessionProgressService.update(item, new QueryWrapper<ReportProfessionProgress>().in("report_id", ids).in("profession_id", collect));
|
|
|
-
|
|
|
+ boolean passAll = false;
|
|
|
+ if (user.getRoleName().equals("超级管理员")) {
|
|
|
+ //超级管理员,可以审核非自己担任专业负责人的
|
|
|
+ passAll = true;
|
|
|
+ }
|
|
|
+ if (passAll) {
|
|
|
+ reportProfessionProgressService.update(item, new QueryWrapper<ReportProfessionProgress>().in("report_id", ids));
|
|
|
+ } else {
|
|
|
+ reportProfessionProgressService.update(item, new QueryWrapper<ReportProfessionProgress>().in("report_id", ids).in("profession_id", collect));
|
|
|
+ }
|
|
|
//全部的专业都审核通过的情况下,更新部门待审核状态
|
|
|
int count = reportProfessionProgressService.count(new QueryWrapper<ReportProfessionProgress>().in("report_id", ids).ne("audit_state", 1));
|
|
|
if (count == 0) {
|