Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java

@@ -53,6 +53,14 @@ public interface SmartAuthorGroupControllerAPI {
     @ApiOperation(value = "修改权限组权限", notes = "修改权限组权限", httpMethod = "POST")
     public CommonResult operateSmartAuthorDepartment(@Validated @RequestBody JSONObject jsonObject);
 
+    @RequestMapping(value = "/getSmartAuthorGroupMenu")
+    @ApiOperation(value = "获取权限组菜单", notes = "获取权限组菜单", httpMethod = "POST")
+    public CommonResult getSmartAuthorGroupMenu(Integer id);
+
+    @RequestMapping(value = "/updateSmartAuthorGroupName")
+    @ApiOperation(value = "修改权限组菜单名称", notes = "修改权限组菜单名称", httpMethod = "POST")
+    public CommonResult updateSmartAuthorGroupName(@Validated @RequestBody JSONObject jsonObject);
+
     @RequestMapping(value = "/queryUserAuthor")
     @ApiOperation(value = "查看用户个人权限", notes = "编辑权限组数据", httpMethod = "POST")
     public CommonResult queryUserAuthor(@RequestParam String userId);

src/main/java/com/template/controller/SmartAuthorGroupController.java

@@ -562,6 +562,40 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
 
     @PassToken
     @Override
+    @DESRespondSecret(validated = false)
+    public CommonResult getSmartAuthorGroupMenu(Integer id) {
+        SmartAuthorGroup smartAuthorGroup = smartAuthorGroupService.getSmartById(id);
+        if (smartAuthorGroup==null || smartAuthorGroup.getDeleted()==1){
+            return CommonResult.fail("当前权限组已删除");
+        }
+        String[] applyIds = smartAuthorGroup.getApplyId().split(",");
+        QueryWrapper<SmartMenu> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("deleted", 0);
+        List<String> applyId_ = Arrays.asList(applyIds);
+        queryWrapper2.in("id", applyId_);
+        List<SmartMenu> list2 = smartMenuService.list(queryWrapper2);
+        return CommonResult.ok(list2);
+    }
+
+    @PassToken
+    @Override
+    public CommonResult updateSmartAuthorGroupName(JSONObject jsonObject) {
+        Integer id = jsonObject.getInteger("id");
+        String name = jsonObject.getString("name");
+        if (id==null || name==null){
+            return CommonResult.fail("请传入参数");
+        }
+        SmartAuthorGroup smartAuthorGroup = smartAuthorGroupService.getSmartById(id);
+        if (smartAuthorGroup==null || smartAuthorGroup.getDeleted()==1){
+            return CommonResult.fail("该权限组已删除");
+        }
+        smartAuthorGroup.setName(name);
+        smartAuthorGroupService.updateSmartAuthorGroup(smartAuthorGroup);
+        return CommonResult.ok("修改成功");
+    }
+
+    @PassToken
+    @Override
     @DESRespondSecret(validated = true)
     public CommonResult queryUserAuthor(String userId) {
         String[] userids = userId.split(",");