commit
This commit is contained in:
+6
@@ -323,8 +323,14 @@ public class ProposalBranchLeaderSuffixAuditController {
|
|||||||
for (ProposalUndertake undertake : undertakeList) {
|
for (ProposalUndertake undertake : undertakeList) {
|
||||||
// 可能有多个
|
// 可能有多个
|
||||||
List<Sys_user_role> userRoleList = userRoleMap.get(undertake.getId());
|
List<Sys_user_role> userRoleList = userRoleMap.get(undertake.getId());
|
||||||
|
if(Lang.isEmpty(userRoleList)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
for (Sys_user_role userRole : userRoleList) {
|
for (Sys_user_role userRole : userRoleList) {
|
||||||
Sys_user user = userMap.get(userRole.getUserId());
|
Sys_user user = userMap.get(userRole.getUserId());
|
||||||
|
if(user == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
String loginname = user.getLoginname();
|
String loginname = user.getLoginname();
|
||||||
if(content.contains("****") && StrUtil.isBlank(proposalId)) {
|
if(content.contains("****") && StrUtil.isBlank(proposalId)) {
|
||||||
content = content.replace("****", undertake.getUnitName());
|
content = content.replace("****", undertake.getUnitName());
|
||||||
|
|||||||
Reference in New Issue
Block a user