From 5b1ad450d3a2ffb2f7f10b4ab3c881987a85538d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Tue, 13 Sep 2022 17:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E3=80=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/SwaggerDoc.xml                     |   5 +-
 .../Controllers/DeptController.cs             |   7 ++-
 .../yi-sqlsugar-dev.db                        | Bin 151552 -> 151552 bytes
 .../Yi.Framework.Interface/IDeptService.cs    |   5 +-
 .../Yi.Framework.Service/DeptService.cs       |   9 ++--
 Yi.Vue3.X.RuoYi/src/api/system/dept.js        |  18 +++----
 Yi.Vue3.X.RuoYi/src/api/system/user.js        |  14 +++---
 .../src/views/system/dept/index.vue           |  46 ++++++++++--------
 .../src/views/system/user/index.vue           |  13 +++--
 9 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
index de78d0ff..c4c4d6a5 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -168,12 +168,11 @@
             <param name="ids"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DeptController.PageList(Yi.Framework.Model.Models.DeptEntity,Yi.Framework.Common.Models.PageParModel)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DeptController.SelctGetList(Yi.Framework.Model.Models.DeptEntity)">
             <summary>
-            动态条件分页查询
+            动态条件查询
             </summary>
             <param name="dept"></param>
-            <param name="page"></param>
             <returns></returns>
         </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.PageList(Yi.Framework.Model.Models.DictionaryEntity,Yi.Framework.Common.Models.PageParModel)">
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DeptController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DeptController.cs
index e2c7252d..b9fb1de5 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DeptController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DeptController.cs
@@ -26,15 +26,14 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         }
 
         /// <summary>
-        /// 动态条件分页查询
+        /// 动态条件查询
         /// </summary>
         /// <param name="dept"></param>
-        /// <param name="page"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> PageList([FromQuery] DeptEntity dept, [FromQuery] PageParModel page)
+        public async Task<Result> SelctGetList([FromQuery] DeptEntity dept)
         {
-            return Result.Success().SetData(await _iDeptService.SelctPageList(dept, page));
+            return Result.Success().SetData(await _iDeptService.SelctGetList(dept));
         }
 
 
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 dd3876ef41de3cfd796f1fdb42a81fe03375f289..8bda6f8177050c7b65132ecaa841a04ce9694283 100644
GIT binary patch
delta 843
zcmZvaPiPZC6vk&Z$+}6+zKAR)YB37MgLIjh{l7=!$xD@jP+Qu@wwBUpOScN1+FJFX
z2U}EPL9|lPdI&{=NhE?I2!(>Z_fiqEvEac&!Hb}qYyxfVGO)YM%<p~Qd*Ae8czQ8B
zcMO;3kEd|?ZU3u|NE|_2ya@whJRiFth@CybD4#&7R2ZSdLMxKKlz$JLjUo5lgC8qT
z7-6iPSnX6vQp2XiR+(%PUDK$!|CT{5Rhb>_Espl$1uAgRji4KH`IE^G$acTL=Z9M)
z<UI<y7>Mz-_L)LRsJ+{y)q$tqz0%Gtr|<gM#I<y$Z*as(U&##Zu0>3nSu$m&X&HL;
ze!-odspPViyQK(hBMvqYRAD23X#6Wg4+ePL#0Ij}72GO@#595u^mtwPAf{`=#Hp^3
z$kT);tgc0<Dfw08_ES=sc~*VAJUMY=uO`dZEScyQu{7o%@|9f<*3d_GqStQkF=_fP
z-P}^8RJxkZIRC>LkuBX+scQPCe0Vng5&sN?;8XrU|9d#va9fuiYW&oT1&bT&xD&9D
zl{c{&_2$T^%os5YjTN0uJRgg2;2>B72Z+~_Hke9DNa7p)K+@{S(u60PGNrzx)!|2D
zpJQnETol#Tm~5DeW-xk*6TMh@2nD4CZ@|qf-hEZmDN||mTOt2?5bc35%_fAAo}Ia4
zx=pD}G*ed%OTi+4CXuK|MnD{DV%$3q-Iw>==Y_4=<*n>;*T}h{@k#g1LM1nM8X{i4
mIH)4nZe(K}PDPup0)DG}OI%BU4>y>_zkox@VlamPocITpY4Sb*

delta 331
zcmZozz}c{XbAmMEnu#*bjB7R~Ec54*V&IqHE8|b*liDm0z`@7Oz!1g4!zRh#=*&6!
zYMi{LnU#^Dm4T(6xq+pDnWd3|k&&)}rLLi&f+3QOxuuawb9UVJ>^R1mh8&Fi(G2|2
z{Lz~g75w?9N6%;UN{<s|00LtMXAU4Gt0;P8!<)&61Q?1di%sB08YmbUSQ#2w85p1m
zSpbFfjEyV}EiFw9jf@SAObm^mZS8)se(KYyT}E8|Ul<tqpEK}3=YPIgu;4cT^aJM^
zS*O2Q&nUsg%rC*fzk@%9UjpbBF8=8f`x)N=1#dC%e*r4L1yp_pqI~=P^NfD{j11HD
o?lW5O8kkrand+IE8ChBynQbq=&p1(FIg0?J0+`qiWc`r`01+`-jsO4v

diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs
index 8c26ddab..26e345a1 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs
@@ -9,11 +9,10 @@ namespace Yi.Framework.Interface
    public partial interface IDeptService:IBaseService<DeptEntity>
     {
         /// <summary>
-        /// 动态条件分页查询
+        /// 动态条件查询
         /// </summary>
         /// <param name="dept"></param>
-        /// <param name="page"></param>
         /// <returns></returns>
-        Task<PageModel<List<DeptEntity>>> SelctPageList(DeptEntity dept, PageParModel page);
+        Task<List<DeptEntity>> SelctGetList(DeptEntity dept);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs b/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs
index bc016d60..a031e847 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs
@@ -9,18 +9,17 @@ using Yi.Framework.Repository;
 
 namespace Yi.Framework.Service
 {
-    public partial class DeptService : BaseService<DeptEntity>, IDeptService
+    public partial class DeptService
     {
-        public async Task<PageModel<List<DeptEntity>>> SelctPageList(DeptEntity dept, PageParModel page)
+        public async Task<List<DeptEntity>> SelctGetList(DeptEntity dept)
         {
-            RefAsync<int> total = 0;
             var data = await _repository._DbQueryable
                     .WhereIF(!string.IsNullOrEmpty(dept.DeptName), u => u.DeptName.Contains(dept.DeptName))
                      .WhereIF(dept.IsDeleted.IsNotNull(), u => u.IsDeleted == dept.IsDeleted)
                     .OrderBy(u => u.OrderNum, OrderByType.Desc)
-                    .ToPageListAsync(page.PageNum, page.PageSize, total);
+                   .ToListAsync();
 
-            return new PageModel<List<DeptEntity>>(data, total);
+            return data;
         }
     }
 }
diff --git a/Yi.Vue3.X.RuoYi/src/api/system/dept.js b/Yi.Vue3.X.RuoYi/src/api/system/dept.js
index 285a5631..0d85cd7f 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/dept.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/dept.js
@@ -3,19 +3,19 @@ import request from '@/utils/request'
 // 查询部门列表
 export function listDept(query) {
   return request({
-    url: '/dept/pageList',
+    url: '/dept/SelctGetList',
     method: 'get',
     params: query
   })
 }
 
-// 查询部门列表（排除节点）
-export function listDeptExcludeChild(deptId) {
-  return request({
-    url: '/system/dept/list/exclude/' + deptId,
-    method: 'get'
-  })
-}
+// // 查询部门列表（排除节点）
+// export function listDeptExcludeChild(deptId) {
+//   return request({
+//     url: '/system/dept/list/exclude/' + deptId,
+//     method: 'get'
+//   })
+// }
 
 // 查询部门详细
 export function getDept(deptId) {
@@ -52,6 +52,6 @@ export function delDept(deptId) {
   return request({
     url: '/dept/delList',
     method: 'delete',
-    data:postId
+    data:deptId
   })
 }
\ No newline at end of file
diff --git a/Yi.Vue3.X.RuoYi/src/api/system/user.js b/Yi.Vue3.X.RuoYi/src/api/system/user.js
index d7588541..39b14803 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/user.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/user.js
@@ -128,10 +128,10 @@ export function updateAuthRole(data) {
   })
 }
 
-// 查询部门下拉树结构
-export function deptTreeSelect() {
-  return request({
-    url: '/system/user/deptTree',
-    method: 'get'
-  })
-}
+// // 查询部门下拉树结构
+// export function deptTreeSelect() {
+//   return request({
+//     url: '/system/user/deptTree',
+//     method: 'get'
+//   })
+// }
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue
index 636a86c5..1479acae 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue
@@ -9,8 +9,8 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
+         <el-form-item label="状态" prop="isDeleted">
+            <el-select v-model="queryParams.isDeleted" placeholder="部门状态" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -50,15 +50,15 @@
          v-if="refreshTable"
          v-loading="loading"
          :data="deptList"
-         row-key="deptId"
+         row-key="id"
          :default-expand-all="isExpandAll"
          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
          <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
          <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-         <el-table-column prop="status" label="状态" width="100">
+         <el-table-column prop="isDeleted" label="状态" width="100">
             <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+               <dict-tag :options="sys_normal_disable" :value="scope.row.isDeleted" />
             </template>
          </el-table-column>
          <el-table-column label="创建时间" align="center" prop="createTime" width="200">
@@ -100,8 +100,8 @@
                      <el-tree-select
                         v-model="form.parentId"
                         :data="deptOptions"
-                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
-                        value-key="deptId"
+                        :props="{ value: 'id', label: 'deptName', children: 'children' }"
+                        value-key="id"
                         placeholder="选择上级部门"
                         check-strictly
                      />
@@ -134,7 +134,7 @@
                </el-col>
                <el-col :span="12">
                   <el-form-item label="部门状态">
-                     <el-radio-group v-model="form.status">
+                     <el-radio-group v-model="form.isDeleted">
                         <el-radio
                            v-for="dict in sys_normal_disable"
                            :key="dict.value"
@@ -156,7 +156,7 @@
 </template>
 
 <script setup name="Dept">
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import { listDept, getDept, delDept, addDept, updateDept} from "@/api/system/dept";
 
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -174,7 +174,7 @@ const data = reactive({
   form: {},
   queryParams: {
     deptName: undefined,
-    status: undefined
+    isDeleted: undefined
   },
   rules: {
     parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
@@ -191,7 +191,7 @@ const { queryParams, form, rules } = toRefs(data);
 function getList() {
   loading.value = true;
   listDept(queryParams.value).then(response => {
-    deptList.value = proxy.handleTree(response.data, "deptId");
+    deptList.value = proxy.handleTree(response.data, "id");
     loading.value = false;
   });
 }
@@ -203,14 +203,14 @@ function cancel() {
 /** 表单重置 */
 function reset() {
   form.value = {
-    deptId: undefined,
+    id: undefined,
     parentId: undefined,
     deptName: undefined,
     orderNum: 0,
     leader: undefined,
     phone: undefined,
     email: undefined,
-    status: "0"
+    isDeleted: false
   };
   proxy.resetForm("deptRef");
 }
@@ -227,10 +227,10 @@ function resetQuery() {
 function handleAdd(row) {
   reset();
   listDept().then(response => {
-    deptOptions.value = proxy.handleTree(response.data, "deptId");
+    deptOptions.value = proxy.handleTree(response.data, "id");
   });
   if (row != undefined) {
-    form.value.parentId = row.deptId;
+    form.value.parentId = row.id;
   }
   open.value = true;
   title.value = "添加部门";
@@ -246,10 +246,16 @@ function toggleExpandAll() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  listDeptExcludeChild(row.deptId).then(response => {
-    deptOptions.value = proxy.handleTree(response.data, "deptId");
+//   listDeptExcludeChild(row.id).then(response => {
+//     deptOptions.value = proxy.handleTree(response.data, "id");
+//   });
+  listDept().then(response => {
+   //前端排除自己
+   
+    deptOptions.value = proxy.handleTree(response.data.filter(i=>i.id!=row.id), "id");
   });
-  getDept(row.deptId).then(response => {
+
+  getDept(row.id).then(response => {
     form.value = response.data;
     open.value = true;
     title.value = "修改部门";
@@ -259,7 +265,7 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["deptRef"].validate(valid => {
     if (valid) {
-      if (form.value.deptId != undefined) {
+      if (form.value.id != undefined) {
         updateDept(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
@@ -278,7 +284,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
-    return delDept(row.deptId);
+    return delDept(row.id);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
index a882a1de..798ab5fd 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
@@ -238,8 +238,9 @@
 
 <script setup name="User">
 import { getToken } from "@/utils/auth";
-import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
+import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser } from "@/api/system/user";
 import { roleOptionselect } from "@/api/system/role";
+import { listDept} from "@/api/system/dept";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
@@ -317,8 +318,14 @@ watch(deptName, val => {
 });
 /** 查询部门下拉树结构 */
 function getDeptTree() {
-   deptTreeSelect().then(response => {
-      deptOptions.value = response.data;
+   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");;
    });
 };
 /** 查询用户列表 */