From 71cf85f535e43aecc1c30e8eb3964f7d8d5a3aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Thu, 15 Sep 2022 19:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebFirst/database/sqlite.db                   | Bin 634880 -> 634880 bytes
 .../Config/SwaggerDoc.xml                     |  21 ++++++
 .../Controllers/DeptController.cs             |  23 +++++-
 .../Controllers/RoleController.cs             |   2 +
 .../yi-sqlsugar-dev.db                        | Bin 151552 -> 151552 bytes
 .../Yi.Framework.Interface/IDeptService.cs    |   8 +++
 .../Yi.Framework.Model/RoleEntity.cs          |   6 +-
 .../Yi.Framework.Service/DeptService.cs       |   5 ++
 Yi.Vue3.X.RuoYi/src/api/system/dept.js        |   9 +++
 Yi.Vue3.X.RuoYi/src/api/system/role.js        |  12 ++--
 .../src/views/system/role/index.vue           |  67 +++++++++++-------
 11 files changed, 117 insertions(+), 36 deletions(-)

diff --git a/WebFirst/database/sqlite.db b/WebFirst/database/sqlite.db
index 661d2ca7c96e8f4b5914b54d9939a9d0c499ff30..6f908b4c7c286324f7bf7bbb5de2179fa33c0183 100644
GIT binary patch
delta 62
zcmZp8pw{p}ZGyDm9|i`7*+2{f-4k_;8UHjUv?egNCNQ-oFt;YKv?j2&Ca|?8u(u{~
KY)#-?upR&_BocA}

delta 62
zcmZp8pw{p}ZGyDmPX-2t*+2{fofCD88Gkk=v?egNCNQ-oFt;YKv?j2&Ca|?8u(u{~
KY)#-?upR&@+Y)L3

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
index 5c7257c5..b1d379e1 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -181,6 +181,27 @@
             <param name="dept"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DeptController.Add(Yi.Framework.Model.Models.DeptEntity)">
+            <summary>
+            添加
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DeptController.Update(Yi.Framework.Model.Models.DeptEntity)">
+            <summary>
+            更新
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DeptController.GetListByRoleId(System.Int64)">
+            <summary>
+            根据角色id获取该角色下全部部门
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.PageList(Yi.Framework.Model.Models.DictionaryEntity,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             动态条件分页查询
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DeptController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DeptController.cs
index b9fb1de5..e6e74b00 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DeptController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DeptController.cs
@@ -37,15 +37,36 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         }
 
 
-
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
         public override async Task<Result> Add(DeptEntity entity)
         {
             return await base.Add(entity);
         }
 
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
         public override async Task<Result> Update(DeptEntity entity)
         {
             return await base.Update(entity);
         }
+
+        /// <summary>
+        /// 根据角色id获取该角色下全部部门
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("{id}")]
+        public async Task<Result> GetListByRoleId(long id)
+        {
+            return Result.Success().SetData(await _iDeptService.GetListByRoleId(id));
+        }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
index 84703810..738acd95 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
@@ -87,5 +87,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             return Result.Success().SetData(await _iRoleService._repository.UpdateIgnoreNullAsync(new RoleEntity() { Id = roleId, IsDeleted = isDel }));
 
         }
+
+      
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 6b62182e49aa08886dc48df008666acc385cce7f..6010d8eb458d1aa4e7ada590e64a95d9987c3deb 100644
GIT binary patch
delta 131
zcmZozz}c{XbAmMEr-?Gote+V4f)h5T%=70dV_@NvVBi<$JHWqgGhcuNA0x+P^*DbP
z{$vKP$yIS~{Gm*|Z1N1o&KwL3!i?e^lUw3E_`Mi;*(4c^9f4wkoD3Y3)#7bg7#JA5
fC#T1|^9L~VvPnZU2y%#WOfHOfZc12|!1w_GM1~z<

delta 253
zcmZozz}c{XbAmMEyNNQ+tnV1~+*fQ&ndi@QhJl4of`MOxuZ%x=GhcuNA0xwL^*Dc)
z5GEeB$yIS~ley!0qWHHk_((E1GjK342y@7a9^L&t*-3!m+1BnC>!%tS7#ZmrSn3)Y
zDj1qt8CzNznCn@Zo0}LI8ygxKL)0V}^9M2VumO#5=I{hFj2(ey334(_R*Sb~@n;6w
zl^*XNRGD6$l9<B40J6>4nG>u+lr6F>?2rKC^WFW=C$vFqGto6NQ!q5QGBLL@Fn|b|
g>Ka%m7@Am_m;l|NXKZL`ZfazbmD7~4EP?R@0IR}5%>V!Z

diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs
index 26e345a1..bbb1a275 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs
@@ -14,5 +14,13 @@ namespace Yi.Framework.Interface
         /// <param name="dept"></param>
         /// <returns></returns>
         Task<List<DeptEntity>> SelctGetList(DeptEntity dept);
+
+
+        /// <summary>
+        /// 根据角色id获取该角色的部门权限
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        Task<List<DeptEntity>> GetListByRoleId(long roleId);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs
index 37fe431d..3aec15c2 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs
@@ -8,9 +8,11 @@ namespace Yi.Framework.Model.Models
 
     public partial class RoleEntity
     {
-        //[Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.RoleId), nameof(UserRoleEntity.UserId))]
-        //public List<UserEntity> Users { get; set; }
+
         [Navigate(typeof(RoleMenuEntity),nameof(RoleMenuEntity.RoleId),nameof(RoleMenuEntity.MenuId))]
         public List<MenuEntity> Menus { get; set; }
+
+        [Navigate(typeof(RoleDeptEntity), nameof(RoleDeptEntity.RoleId), nameof(RoleDeptEntity.DeptId))]
+        public List<DeptEntity> Depts { get; set; }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs b/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs
index a031e847..fc04ad51 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs
@@ -21,5 +21,10 @@ namespace Yi.Framework.Service
 
             return data;
         }
+
+        public async Task<List<DeptEntity>> GetListByRoleId(long roleId)
+        {
+            return (await _repository._Db.Queryable<RoleEntity>().Includes(r => r.Depts).SingleAsync(r => r.Id == roleId)).Depts;
+        }
     }
 }
diff --git a/Yi.Vue3.X.RuoYi/src/api/system/dept.js b/Yi.Vue3.X.RuoYi/src/api/system/dept.js
index 0d85cd7f..cf28c932 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/dept.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/dept.js
@@ -54,4 +54,13 @@ export function delDept(deptId) {
     method: 'delete',
     data:deptId
   })
+}
+
+
+// 根据角色ID查询菜单下拉树结构
+export function roleDeptTreeselect(roleId) {
+  return request({
+    url: '/dept/getListByRoleId/' + roleId,
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/Yi.Vue3.X.RuoYi/src/api/system/role.js b/Yi.Vue3.X.RuoYi/src/api/system/role.js
index 60ec5f10..7f401116 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/role.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/role.js
@@ -113,12 +113,12 @@ export function authUserSelectAll(data) {
 }
 
 // 根据角色ID查询部门树结构
-export function deptTreeSelect(roleId) {
-  return request({
-    url: '/system/role/deptTree/' + roleId,
-    method: 'get'
-  })
-}
+// export function deptTreeSelect(roleId) {
+//   return request({
+//     url: '/system/role/deptTree/' + roleId,
+//     method: 'get'
+//   })
+// }
 // 获取角色选择框列表
 export function roleOptionselect() {
   return request({
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
index 99d9cc4d..ea2bfefb 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
@@ -137,18 +137,18 @@
     <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
-          <el-input v-model="form.role.roleName" :disabled="true" />
+          <el-input v-model="form.roleName" :disabled="true" />
         </el-form-item>
         <el-form-item label="权限字符">
-          <el-input v-model="form.role.roleCode" :disabled="true" />
+          <el-input v-model="form.roleCode" :disabled="true" />
         </el-form-item>
         <el-form-item label="权限范围">
-          <el-select v-model="form.role.dataScope" @change="dataScopeSelectChange">
+          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
             <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="数据权限" v-show="form.role.dataScope == 2">
+        <el-form-item label="数据权限" v-show="form.dataScope == 1">
           <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
           <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
           <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动
@@ -165,13 +165,14 @@
         </div>
       </template>
     </el-dialog>
+    
   </div>
 </template>
 
 <script setup name="Role">
-import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role";
+import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole } from "@/api/system/role";
 import { roleMenuTreeselect, treeselect as menuTreeselect, listMenu } from "@/api/system/menu";
-
+import { listDept,roleDeptTreeselect } from "@/api/system/dept";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -198,11 +199,11 @@ const deptRef = ref(null);
 
 /** 数据范围选项*/
 const dataScopeOptions = ref([
-  { value: "1", label: "全部数据权限" },
-  { value: "2", label: "自定数据权限" },
-  { value: "3", label: "本部门数据权限" },
-  { value: "4", label: "本部门及以下数据权限" },
-  { value: "5", label: "仅本人数据权限" }
+  { value: 0, label: "全部数据权限" },
+  { value: 1, label: "自定数据权限" },
+  { value: 2, label: "本部门数据权限" },
+  { value: 3, label: "本部门及以下数据权限" },
+  { value: 4, label: "仅本人数据权限" }
 ]);
 
 const data = reactive({
@@ -330,7 +331,8 @@ function reset() {
       IsDeleted: false,
       menuCheckStrictly: false,
       deptCheckStrictly: false,
-      remark: undefined
+      remark: undefined,
+      dataScope:0
     },
     menuIds: [],
     deptIds: []
@@ -370,7 +372,6 @@ function getRoleMenuTreeselect(roleId) {
     response.data.forEach(m => {
       menuIds.push(m.id)
     })
-
     menuIds.forEach((v) => {
       nextTick(() => {
         menuRef.value.setChecked(v, true, false);
@@ -384,9 +385,30 @@ function getRoleMenuTreeselect(roleId) {
   }
 /** 根据角色ID查询部门树结构 */
 function getDeptTree(roleId) {
-      return deptTreeSelect(roleId).then(response => {
-        deptOptions.value = response.depts;
-        return response;
+      return listDept().then(response => {
+    
+        const selectList = [];
+      response.data.forEach(res => {
+         selectList.push({ id: res.id, label: res.deptName, parentId: res.parentId, orderNum: res.orderNum, children: [] })
+      }
+
+      )
+      deptOptions.value = proxy.handleTree(selectList, "id");
+
+      const deptIds=[];
+      roleDeptTreeselect(roleId).then(response=>{
+        response.data.forEach(d=>{
+
+          deptIds.push(d.id)
+        })
+      
+
+      })
+      nextTick(() => {
+              if (deptRef.value) {
+                deptRef.value.setCheckedKeys(deptIds);
+              }
+            });
       });
     }
 /** 树权限（展开/折叠）*/
@@ -464,19 +486,10 @@ function dataScopeSelectChange(value) {
 /** 分配数据权限操作 */
 function handleDataScope(row) {
       reset();
-      const deptTreeSelect = getDeptTree(row.id);
+     getDeptTree(row.id);
       getRole(row.id).then(response => {
         form.value = response.data;
-        openDataScope.value = true;
-        nextTick(() => {
-          deptTreeSelect.then(res => {
-            nextTick(() => {
-              if (deptRef.value) {
-                deptRef.value.setCheckedKeys(res.checkedKeys);
-              }
-            });
-          });
-        });
+        openDataScope.value = true;    
         title.value = "分配数据权限";
       });
     }