Jelajahi Sumber

Fix 修复新增用户及角色的问题

YueYunyun 2 tahun lalu
induk
melakukan
3e3d59f0d3

+ 1 - 1
SERVER/VberAdminPlus/vber-admin/src/main/resources/application.yml

@@ -174,7 +174,7 @@ mybatis-plus:
     dbConfig:
       # 主键类型
       # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
-      idType: ASSIGN_ID
+      idType: AUTO
       # 逻辑已删除值
       logicDeleteValue: 2
       # 逻辑未删除值

+ 7 - 2
SERVER/VberAdminPlus/vber-system/src/main/java/com/vber/system/controller/system/SysMenuController.java

@@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -63,7 +64,7 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单下拉树列表
      */
-    @GetMapping("/treeSelect")
+    @GetMapping("/tree/select")
     public R<List<Tree<Long>>> treeSelect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return R.ok(menuService.buildMenuTreeSelect(menus));
@@ -78,7 +79,11 @@ public class SysMenuController extends BaseController {
     public R<Map<String, Object>> roleMenuTreeSelect(@PathVariable("roleId") Long roleId) {
         List<SysMenu> menus = menuService.selectMenuList(getUserId());
         Map<String, Object> ajax = new HashMap<>();
-        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        if(roleId!=0){
+            ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        }else{
+            ajax.put("checkedKeys", new ArrayList<Long>());
+        }
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));
         return R.ok(ajax);
     }

+ 1 - 1
UI/VAP.Vue/src/api/system/_menu.ts

@@ -38,7 +38,7 @@ class menuApi {
 	// 查询菜单下拉树结构
 	treeselect = () => {
 		return Rs.get({
-			url: "/system/menu/treeselect"
+			url: "/system/menu/tree/select"
 		})
 	}
 

+ 1 - 1
UI/VAP.Vue/src/views/system/user/index.vue

@@ -168,7 +168,7 @@ const modalOpts = reactive({
 			component: "i",
 			rules: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
 			props: {
-				maxlength: 11
+				maxlength: 50
 			},
 			span: 12
 		},