Merge remote-tracking branch 'origin/master' into prod

authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -364,6 +364,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
                 sysWorkVo.setDeptNames(CollUtil.newArrayList(userDeptNames));
                 List<Long> deptRoleIds = new ArrayList<>();
                 List<String> deptRoleNames = new ArrayList<>();
+                List<String> deptRoleCodes = new ArrayList<>();
                 if (CollUtil.isNotEmpty(workVoDeptIds)) {
                     // 部门角色
                     List<SysDeptRole> sysDeptRoles = sysDeptRoleMapper.selectList(Wrappers.<SysDeptRole>lambdaQuery()
@@ -375,9 +376,11 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
                         List<SysRole> sysRoles = sysRoleMapper.selectList(new LambdaQueryWrapper<SysRole>().in(SysRole::getId, deptRoleIds));
                         if (CollUtil.isNotEmpty(sysRoles)) {
                             deptRoleNames = sysRoles.stream().map(SysRole::getName).distinct().collect(Collectors.toList());
+                            deptRoleCodes = sysRoles.stream().map(SysRole::getCode).distinct().collect(Collectors.toList());
                         }
                     }
                 }
+                sysWorkVo.setDeptRoleCodes(deptRoleCodes);
                 sysWorkVo.setDeptRoleIds(deptRoleIds);
                 sysWorkVo.setDeptRoleNames(deptRoleNames);
 

authorize-api/src/main/java/com/xy/dto/SysWorkUser/SysWorkVo.java

@@ -75,4 +75,7 @@ public class SysWorkVo {
 
     @ApiModelProperty("部门角色ID")
     private List<Long> deptRoleIds;
+
+    @ApiModelProperty("部门角色编码")
+    private List<String> deptRoleCodes;
 }