!92 角色管理页面：分配功能和分配按钮窗口标题增加角色名

Merge pull request !92 from 清风朗月/master

jshERP-boot/src/main/java/com/jsh/erp/controller/UserBusinessController.java

@@ -1,7 +1,9 @@
 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;
@@ -9,6 +11,7 @@ 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;
@@ -31,6 +34,9 @@ public class UserBusinessController {
     @Resource
     private UserBusinessService userBusinessService;
 
+    @Resource
+    private RoleService roleService;
+
     /**
      * 获取信息
      * @param keyId
@@ -75,6 +81,12 @@ 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);
     }