|
@@ -40,6 +40,8 @@ import io.swagger.annotations.ApiOperation;
|
|
@RequestMapping("${$rmp}" + "user")
|
|
@RequestMapping("${$rmp}" + "user")
|
|
public class UserCloudServiceProvider extends ControllerSupport implements UserCloudService {
|
|
public class UserCloudServiceProvider extends ControllerSupport implements UserCloudService {
|
|
|
|
|
|
|
|
+ private static final long serialVersionUID = -5270235759913273972L;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
UserService userService;
|
|
UserService userService;
|
|
|
|
|
|
@@ -94,7 +96,7 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
|
|
if (CollectionUtils.isNotEmpty(userRoles)) {
|
|
if (CollectionUtils.isNotEmpty(userRoles)) {
|
|
for (UserRole cur : userRoles) {
|
|
for (UserRole cur : userRoles) {
|
|
RoleBean roleBean = new RoleBean();
|
|
RoleBean roleBean = new RoleBean();
|
|
- roleBean.setRoleId(cur.getRoleCode());
|
|
|
|
|
|
+ roleBean.setRoleCode(cur.getRoleCode());
|
|
String roleName = RoleMeta.valueOf(cur.getRoleCode()).getCnName();
|
|
String roleName = RoleMeta.valueOf(cur.getRoleCode()).getCnName();
|
|
roleBean.setRoleName(roleName);
|
|
roleBean.setRoleName(roleName);
|
|
roleList.add(roleBean);
|
|
roleList.add(roleBean);
|