|
|
@@ -4543,7 +4543,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
//审核流程状态
|
|
|
Integer packageEngineering = company.getPackageEngineering();
|
|
|
if (packageEngineering.equals(0)){
|
|
|
- List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id",user.getCompanyId()));
|
|
|
if(String.valueOf(map.get("state")).equals("1")){
|
|
|
row.createCell(index).setCellValue("——");
|
|
|
}else if (String.valueOf(map.get("state")).equals("-1")){
|
|
|
@@ -4553,7 +4552,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
if(String.valueOf(map.get("isDeptAudit")).equals("1")){
|
|
|
String deptAuditorId = map.get("deptAuditorName")+"";
|
|
|
String departmentName = map.get("departmentName") + "";
|
|
|
- for (User item : users) {
|
|
|
+ for (User item : userList) {
|
|
|
if (item.getId().equals(deptAuditorId)){
|
|
|
if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
String deptAuditorName ="$userName="+ item.getCorpwxRealUserid() +"$";
|
|
|
@@ -4584,7 +4583,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
String projectAuditorName = map.get("projectAuditorName")+"";
|
|
|
String projectAuditorId = map.get("projectAuditorId")+"";
|
|
|
if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
- for (User item : users) {
|
|
|
+ for (User item : userList) {
|
|
|
if (item.getId().equals(projectAuditorId)){
|
|
|
projectAuditorName ="$userName="+ item.getCorpwxUserid() +"$";
|
|
|
row.createCell(index).setCellValue("待项目审核人" + "(" + projectAuditorName + ")审核");
|
Min