Browse Source

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

YueYunyun 2 years ago
parent
commit
68d8416126

+ 4 - 2
SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/system/controller/system/SysMenuController.java

@@ -65,7 +65,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));
@@ -80,7 +80,9 @@ 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));
+        }
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));
         return R.ok(ajax);
     }

+ 1 - 1
UI/XYH.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"
 		})
 	}
 

+ 3 - 3
UI/XYH.VUE/src/views/system/role/index.vue

@@ -41,7 +41,7 @@ const orgOptions = ref([])
 
 const tableRef = ref()
 const modalRef = ref()
-const dataScorpModalRef = ref()
+const dataScopeModalRef = ref()
 const opts = reactive({
 	columns: [
 		{ field: "roleId", name: "角色ID", width: 100, isSort: true, visible: true },
@@ -334,7 +334,7 @@ function handleDataScope(row: any) {
 	const orgTreeSelect = getOrgTree(row.roleId)
 	apis.system.roleApi.getRole(row.roleId).then(({ data }) => {
 		form.value = data
-		dataScorpModalRef.value.show()
+		dataScopeModalRef.value.show()
 		nextTick(() => {
 			orgTreeSelect.then((res) => {
 				nextTick(() => {
@@ -556,7 +556,7 @@ function getOrgAllCheckedKeys() {
 			</template>
 		</VbModal>
 		<VbModal
-			v-model:modal="dataScorpModalRef"
+			v-model:modal="dataScopeModalRef"
 			title="分配数据权限"
 			:form-data="form"
 			:form-items="opts.formItems2 as any"

+ 1 - 1
UI/XYH.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
 		},