feat: 适配生产企业监督分管领导名称显示规则

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1351,7 +1351,7 @@ public class WmSupervisionManager {
         List<SysUserRole> userRoles = userRoleService.list(Wrappers.<SysUserRole>lambdaQuery().in(SysUserRole::getUserId, userIds));
         Map<Integer, List<SysUserRole>> userRoleMap = userRoles.stream().collect(Collectors.groupingBy(SysUserRole::getUserId));
         Set<Integer> roleId = userRoles.stream().mapToInt(SysUserRole::getRoleId).boxed().collect(Collectors.toSet());
-        Map<Integer, String> roleMap = roleService.listByIds(roleId).stream().collect(Collectors.toMap(SysRole::getRoleId, SysRole::getRoleName));
+        Map<Integer, SysRole> roleMap = roleService.listByIds(roleId).stream().collect(Collectors.toMap(SysRole::getRoleId, Function.identity()));
 
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN);
@@ -1377,7 +1377,8 @@ public class WmSupervisionManager {
                 advMsg = advices.stream().map(adv -> {
                     SysUser u = userMap.get(adv.getCreateBy());
                     SysUserRole sysUserRole = userRoleMap.get(u.getUserId()).get(0);
-                    String roleName = roleMap.get(sysUserRole.getRoleId());
+                    SysRole role = roleMap.get(sysUserRole.getRoleId());
+                    String roleName = (role == null ? " " : (StrUtil.isNotBlank(role.getRoleDesc()) ? role.getRoleDesc() : role.getRoleName()));
                     String realName = u.getRealname();
                     String date = formatter.format(adv.getCreateTime());
                     String resultMsg = adv.getAdviceResult() ? " 通过 " : " 不通过 ";