回退 'Pull Request !92 : 角色管理页面:分配功能和分配按钮窗口标题增加角色名'

This commit is contained in:
季圣华
2024-11-01 15:58:11 +00:00
committed by Gitee
parent e932166007
commit c38c2fc529
3 changed files with 7 additions and 30 deletions

View File

@@ -1,9 +1,7 @@
package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.Role;
import com.jsh.erp.datasource.entities.UserBusiness;
import com.jsh.erp.service.role.RoleService;
import com.jsh.erp.service.userBusiness.UserBusinessService;
import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo;
@@ -11,7 +9,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -34,9 +31,6 @@ public class UserBusinessController {
@Resource
private UserBusinessService userBusinessService;
@Resource
private RoleService roleService;
/**
* 获取信息
* @param keyId
@@ -81,12 +75,6 @@ public class UserBusinessController {
Map<String, Object> objectMap = new HashMap<String, Object>();
Long id = userBusinessService.checkIsValueExist(type, keyId);
objectMap.put("id", id);
if("RoleFunctions".equals(type)){
List<Role> roles = roleService.getRoleListByIds(keyId);
if(!CollectionUtils.isEmpty(roles)){
objectMap.put("name", roles.get(0).getName());
}
}
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
}