From e78e9d8e5553fc45e72a47ffee46787a656b94e1 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 19:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=B2=97=E4=BD=8D=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Framework.ApiMicroservice/Program.cs   |   2 +-
 .../yi-sqlsugar-dev.db                        | Bin 151552 -> 151552 bytes
 .../Yi.Framework.Model/UserEntity.cs          |   5 ++++
 .../Yi.Framework.Service/UserService.cs       |   4 ++-
 .../src/views/system/user/index.vue           |  27 ++++++++++++------
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs
index b9cf8ffb..52e69fb6 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs
@@ -135,7 +135,7 @@ ServiceLocator.Instance = app.Services;
 #region
 //错误抓取反馈注入
 #endregion
-app.UseErrorHandlingService();
+//app.UseErrorHandlingService();
 #region
 //静态文件注入
 #endregion
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 3004486fed272e47e1869d1dbb0180d982983dae..5c8c1e1d87e53999d5c0edaf3073d9d5e7f0bc69 100644
GIT binary patch
delta 1446
zcmZozz}c{XbAq(s83qOhRUn1|yNNo+jAu3`Ea4YnXOCp&s^rb!SLbQtG~@7MkK~Nm
ztSI2fUf-C<F2M%WVa(vn!64pfY0Dt4&cL9|z#z*edZN~dhe?3J$iT=**T7QO&{)CH
z(#pU9h|q+LtPG9yERD^KjVufkK_EQMuP~y#$k8Ii$HmzrCp{<9FVQffIIJSsUpFwy
zG&|nd%pyBIFx;o!+uJq6H>BJ&EVtA%Dyu3gFvLID$Soq>JkYqzE5tcF$ve$6y~H><
z*T}!5JT1*6EJ@qF+|4VuA}qwEG|=C;*woS17Hp@Xk+GqPi9=zbUUGh}p|ORLfw6(H
zrHLs>+{nbxg!jR=&C6357#cI#5I&w9E@94VYH4L`sb_9sY;106GI_SdWOk_9$)=J|
z88>W}mYT{~&*#o?4HQt$3=C)i#eg%Q3@!CcO^r+}4NXZ46)b@gPNPuS+$K}U%*@We
zY%{yUe10w-W;RBMcP4Mp4`CMKel?lhK%R{!fk&15)n-M7ecbhya$Ia|Yz)?*WCm2a
z@Botllc?~+yN<x5f+Hj#>BH2>QWiriqbOVS-wjTLwaP%Xx*@D(5M_%j3p*qLbumUt
zg<C6)VlB6GlK|7?dG>PBkchW1F}0LJS26j8jRGfJezTx$I}=+iNGHSO^)_+{naM}(
z?U{x6xhAta$g}aQ@Qd?v0fXrt-}D3L8QEMRp(6(kRZvhd$|7+XWS|_dlcbS2j8X_r
zbEyCJP=Cga0*s#1*%KJ$IT+V72QzpwD@}Bi=4wh-XBU^1Wo(t4ej<@EZ+cP+<GbzN
z35>;z+m(_TAD!W2<vY*7f0)0G-;<w*?>x|Ld->|ES$W`52#Lf)PQXZn=6BH(Nmo~4
z=6gtJni*NMV9^YZ0-)x+2Y56y12xw}QxDu~c)9`Vjx;=kBO-xTGoe|{?coHB{iBCV
zjsqhGo7EOp&^R<VvSx&7Hi9NykZuMf-56FQbZ`H^pYb@qRqaAhK(WH25XfO<LE<nl
T!(t8OE+%efHcnumf~^4no`+o9

delta 461
zcmZozz}c{XbAq(sAqEBpRUn1|+le~HjE6QREa4Yn<M3kOs^rb!SLbQtG~@8%XyuIA
ztf*kbG1*JPh1bx?%G6ZP)X>7z($Z-1Y>CP2q9@WP=N}T7Y%2MbaqVVlsi};iH`##Z
zIx{$PFbFqV+A;`>GcX7<Fo=sDJzR3UNr1t~z{p6~z*5)HP{Gj53TUE%sh**wg`tI|
z5e_L!V+&)TWtAL8hQ@|QK(x6{rjD7JjeqlIc7^%;TtMrjM2}7^Yi^pnK|h3<pJ(=D
zb_02!t4n!AETy^F*w`4XL0%O-Q53P`kO0%<dG>PBP_LL<T1ug-nEb*<ffFvjS<tqf
zi4CliVe)z#IfTsQqxSa9{QQQK*&RT(aq~|<aGsG(4q}Nk4>KDh)J8@r1gAOFe|xAu
z<3<5S@9FFbjPe`|-ps*_`<Rs`I?8TepU7Cu$kmjn&Mq!1%h)P9Jvf0eZ+d+Sqxf`z
UG{&pjm691Bo!QPJ!1zZV0GzIMNB{r;

diff --git a/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
index ebdb3f40..470fdd20 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
@@ -14,6 +14,11 @@ namespace Yi.Framework.Model.Models
         [Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))]
         public List<RoleEntity> Roles { get; set; }
 
+        [Navigate(typeof(UserPostEntity), nameof(UserPostEntity.UserId), nameof(UserPostEntity.PostId))]
+        public List<PostEntity> Posts { get; set; }
+
+        [Navigate( NavigateType.OneToOne,nameof(DeptId))]
+        public DeptEntity Dept { get; set; }
 
         /// <summary>
         /// 鏋勫缓瀵嗙爜锛孧D5鐩愬�煎姞瀵�
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
index c5ad788c..c8aaf644 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
@@ -131,7 +131,7 @@ namespace Yi.Framework.Service
 
         public async Task<UserEntity> GetInfoById(long userId)
         {
-            return await _repository._DbQueryable.Includes(u => u.Roles).InSingleAsync(userId);
+            return await _repository._DbQueryable.Includes(u => u.Roles).Includes(u=>u.Posts).Includes(u=>u.Dept).InSingleAsync(userId);
         }
 
         public async Task<UserRoleMenuDto> GetUserAllInfo(long userId)
@@ -194,6 +194,8 @@ namespace Yi.Framework.Service
                     .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)
                      .WhereIF(user.IsDeleted.IsNotNull(),u => u.IsDeleted == user.IsDeleted)
                      .Includes(u => u.Roles)
+                     .Includes(u=>u.Posts)
+                     .Includes(u=>u.Dept)
                     .OrderBy(u => u.OrderNum, OrderByType.Desc)
                     .ToPageListAsync(page.PageNum, page.PageSize, total);
 
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 9a08f1d6..2c61a5d6 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
@@ -71,7 +71,7 @@
                   :show-overflow-tooltip="true" />
                <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nick" prop="nick" v-if="columns[2].visible"
                   :show-overflow-tooltip="true" />
-               <el-table-column label="閮ㄩ棬" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+               <el-table-column label="閮ㄩ棬" align="center" key="dept.deptName" prop="dept.deptName" v-if="columns[3].visible"
                   :show-overflow-tooltip="true" />
                <el-table-column label="鎵嬫満鍙风爜" align="center" key="phone" prop="phone" v-if="columns[4].visible"
                   width="120" />
@@ -504,14 +504,25 @@ function handleUpdate(row) {
    reset();
    const userId = row.id || ids.value;
    getUser(userId).then(response => {
+     
+
       form.value.user = response.data;
-      form.value.postIds = [];
-      response.data.roles.forEach(role => {
-         form.value.roleIds.push(role.id)
-      });
-      open.value = true;
-      title.value = "淇敼鐢ㄦ埛";
-      form.value.user.password = null;
+
+response.data.posts.forEach(post => {
+   form.value.postIds.push(post.id)
+});
+
+form.value.deptId= response.data.deptId;
+
+response.data.roles.forEach(role => {
+   form.value.roleIds.push(role.id)
+});
+open.value = true;
+title.value = "淇敼鐢ㄦ埛";
+form.value.user.password = null;
+
+
+
    });
 };
 /** 鎻愪氦鎸夐挳 */