添加菜单资源配置

bill-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleAuthController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.base.system.role.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.menu.model.MenuTreeSelect;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.role.model.RoleAuthEntity;
@@ -85,14 +86,15 @@ public class RoleAuthController extends BaseCRUDJsonBodyMappingController<RoleAu
     @ApiOperation(value = "根据角色编辑菜单")
     @PostMapping(value = "editMenu")
     public String editMenu(@RequestBody RoleAuthQuery query) {
-        try {
-            service.editMenu(query, this.getContext());
         JSONObject ret = new JSONObject();
+        Map<String, Object> model = new HashMap<>();
+        try {
+            List<MenuTreeSelect> menuTreeSelects = service.editMenu(query, this.getContext());
+            model.put(KEY_RESULT_DATA, menuTreeSelects);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             return ret.toJSONString();
         } catch (Exception e) {
             log.error("角色编辑菜单错误", e);
-            JSONObject ret = new JSONObject();
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
             ret.put(KEY_RESULT_MSG, super.convertException(e));
             return ret.toJSONString();
@@ -106,13 +108,10 @@ public class RoleAuthController extends BaseCRUDJsonBodyMappingController<RoleAu
     @PostMapping(value = "editResource")
     public String editResource(@RequestBody RoleAuthQuery query) {
         JSONObject ret = new JSONObject();
-        Map<String, Object> model = new HashMap<>();
         try {
             Map<String, List<ResourceEntity>> group = resourceService.group(query.getRoleId(), getContext());
-            model.put(KEY_RESULT_DATA, group);
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-            ret.put(KEY_RESULT_DATA, model);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            ret.put(KEY_RESULT_DATA, group);
             return ret.toJSONString();
         } catch (Exception e) {
             log.error("角色编辑资源错误", e);