代码优化

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/dto/CheckedInfo.java

@@ -1,5 +1,4 @@
 package com.cloud.kicc.system.api.dto;
-
 import lombok.Data;
 
 /**
@@ -13,8 +12,8 @@ import lombok.Data;
 @Data
 public class CheckedInfo {
 
-    private String[] checkedKeys;
+    private String[] checkedKeys = new String[0];
 
-    private String[] halfCheckedKeys;
+    private String[] halfCheckedKeys = new String[0];
 
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java

@@ -3,11 +3,13 @@ package com.cloud.kicc.system.controller;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.log.annotation.SysLog;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.system.api.entity.Menu;
+import com.cloud.kicc.system.api.entity.Role;
 import com.cloud.kicc.system.api.entity.RoleMenu;
 import com.cloud.kicc.system.api.vo.ResultVo;
 import com.cloud.kicc.system.service.MenuService;
@@ -77,6 +79,13 @@ public class MenuController {
     @PostMapping("/save")
     @PreAuthorize("@pms.hasPermission('menu_add')")
     public R save(@RequestBody Menu menu) {
+        RoleMenu roleMenu = new RoleMenu();
+        if (menu.getParentId()!="0"){
+            roleMenuService.update(Wrappers.<RoleMenu>lambdaUpdate()
+                    .eq(RoleMenu::getRoleId,roleMenu.getRoleId())
+                    .eq(RoleMenu::getMenuId,menu.getParentId())
+                    .set(RoleMenu::getCheckeType, "2"));
+        }
         menuService.save(menu);
         return R.ok();
     }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OfficeController.java

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * @Author: TangSheng
@@ -39,14 +40,14 @@ public class OfficeController {
 
     /**
      * 分页条件查询
-     * @param page
+     * @param
      * @param office
      * @return
      */
     @GetMapping("/list")
-    public R list(Page page, Office office) {
+    public R list( Office office) {
-        Page result = officeService.page(page, getQueryWrapper(office));
+        List<Office> result = officeService.list( getQueryWrapper(office));
-        return R.ok(result.getRecords(), result.getTotal());
+        return R.ok(result, result.size());
     }
 
     /**