LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修改没有部门后会议查不出来的bug

Browse Source
This commit is contained in:
lijiarao
2021-10-19 17:30:30 +08:00
parent e3257bf4be
commit ad6af73b3d
15 changed files with 97 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+2 -6
View File
@@ -81,9 +81,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
IPage<PayMemberProject> memberProjectPage = memberProjectService.getPage(page, queryWrapper);
for (PayMemberProject memberProject : memberProjectPage.getRecords()) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
memberProject.setDirectorName(user.getRealname() + "(" + departName + ")");
memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
}
return Result.OK(memberProjectPage);
}
@@ -261,9 +259,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
}
for (PayMemberProject memberProject : pageList) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
memberProject.setDirectorName(user.getRealname() + "(" + departName + ")");
memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
}
return super.exportListXls(pageList, PayMemberProject.class, "会员项目表");
}
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+2 -3
View File
@@ -97,9 +97,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
for (PayMemberProjectSubitem memberProjectSubitem : pageList.getRecords()) {
//DirectorName存的是id
LoginUser user = sysBaseAPI.getUserById(memberProjectSubitem.getDirectorName());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
memberProjectSubitem.setDirectorName(user.getRealname() + "(" + departName + ")");
memberProjectSubitem.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
}
return Result.OK(pageList);
}