From d67b4fa21a7376ab787177e073ea03a0fd731720 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Fri, 16 Dec 2022 16:04:51 +0800
Subject: [PATCH] add"userdept

---
 .../controller/user/UserController.java       |  3 +-
 .../system/service/user/ISysUserService.java  |  3 +-
 .../service/user/dao/mapper/SysUserMapper.xml | 48 +++++++++----------
 .../user/impl/ISysUserServiceImpl.java        |  4 +-
 nladmin-ui/src/views/system/user/index.vue    |  8 +++-
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
index 465612e..eec3df9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
@@ -61,8 +61,7 @@ public class UserController {
     @ApiOperation("查询用户")
     @GetMapping
     public ResponseEntity<Object> query(UserQuery query, PageQuery page){
-        List<Map<String, Object>> userDetail = userService.getUserDetail(query, page);
-        return new ResponseEntity(TableDataInfo.build(userDetail),HttpStatus.OK);
+        return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)),HttpStatus.OK);
     }
 
     @Log("新增用户")
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
index bde5fe7..fe09993 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.system.service.user.dao.SysUser;
+import org.nl.system.service.user.dto.SysUserDetail;
 import org.nl.system.service.user.dto.UserQuery;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,6 +23,6 @@ public interface ISysUserService extends IService<SysUser> {
 
     Map<String, String> updateAvatar(MultipartFile avatar);
 
-    List<Map<String, Object>> getUserDetail(UserQuery query, PageQuery pageQuery);
+    List<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery);
 
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
index add2567..b138d87 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
@@ -25,49 +25,46 @@
         sys_user.extuser_id as extuserId
     </sql>
     <resultMap id="UserDetail" type="org.nl.system.service.user.dto.SysUserDetail" >
-        <id column="user_id" property="userId"  />
+        <id column="userId" property="userId"  />
         <result column="username" property="username" />
-        <result column="person_name" property="personName" />
+        <result column="personName" property="personName" />
         <result column="gender" property="gender" />
         <result column="phone" property="phone" />
         <result column="email" property="email" />
-        <result column="avatar_name" property="avatarName" />
-        <result column="avatar_path" property="avatarPath" />
+        <result column="avatarName" property="avatarName" />
+        <result column="avatarPath" property="avatarPath" />
         <result column="password" property="password" />
-        <result column="is_admin" property="isAdmin" />
-        <result column="is_used" property="isUsed" />
-        <result column="pwd_reset_user_id" property="pwdResetUserId" />
-        <result column="pwd_reset_time" property="pwdResetTime" />
+        <result column="isAdmin" property="isAdmin" />
+        <result column="isUsed" property="isUsed" />
+        <result column="pwdResetUserId" property="pwdResetUserId" />
+        <result column="pwdResetTime" property="pwdResetTime" />
         <result column="create_id" property="createId" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-        <result column="update_id" property="updateId" />
-        <result column="update_name" property="updateName" />
-        <result column="update_tim" property="updateTime" />
-        <result column="extperson_id" property="extpersonId" />
-        <result column="extuser_i" property="extuserId" />
+        <result column="createName" property="createName" />
+        <result column="createTime" property="createTime" />
+        <result column="updateId" property="updateId" />
+        <result column="updateName" property="updateName" />
+        <result column="updateTime" property="updateTime" />
+        <result column="extpersonId" property="extpersonId" />
+        <result column="extuserId" property="extuserId" />
         <collection property="depts" ofType="org.nl.system.service.dept.dao.SysDept">
-            <id property="dept_id" column="deptId"/>
-            <result column="dept_name" property="name"/>
+            <id property="deptId" column="deptId"/>
+            <result column="deptName" property="name"/>
         </collection>
         <collection property="roles" ofType="org.nl.system.service.role.dao.SysRole">
-            <id property="role_id" column="levelId"/>
-            <result column="name" property="name"/>
+            <id property="roleId" column="roleId"/>
         </collection>
     </resultMap>
     <select id="getUserDetail" resultMap="UserDetail">
         SELECT
         <include refid="Base_Column_List"/>
-        ,sys_dept.dept_id
-        ,sys_dept.name as dept_name
-        ,sys_role.role_id
-        ,sys_role.name as role_name
+        ,sys_dept.dept_id as deptId
+        ,sys_dept.name as deptName
+        ,sys_users_roles.role_id as roleId
         FROM
         sys_user
         left join sys_user_dept on sys_user.user_id = sys_user_dept.user_id
         left join sys_users_roles on sys_users_roles.user_id = sys_user.user_id
         left join sys_dept on sys_user_dept.dept_id = sys_dept.dept_id
-        left join sys_role on sys_users_roles.role_id = sys_role.role_id
         <where>
             <if test="query.deptId  != null">
                 and sys_dept.dept_id = #{query.deptId}
@@ -82,10 +79,9 @@
                 and #{query.endTime} >= sys_user.create_time
             </if>
             <if test="query.blurry  != null">
-              and (email like query.blurry or username like query.blurry or person_name like query.blurry)
+                and (email like #{query.blurry} or username like #{query.blurry} or person_name like #{query.blurry})
             </if>
         </where>
-        GROUP BY sys_user.user_id
     </select>
 
     <select id="getDetailForMap" resultType="java.util.Map">
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
index fb54367..3d32478 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
@@ -57,8 +57,8 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
     }
 
     @Override
-    public List<Map<String, Object>> getUserDetail(UserQuery query, PageQuery pageQuery) {
-        List<Map<String, Object>> userDetail = sysUserMapper.getDetailForMap(query, pageQuery);
+    public List<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery) {
+        List<SysUserDetail> userDetail = sysUserMapper.getUserDetail(query, pageQuery);
         return userDetail;
     }
 }
diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue
index 63c59a7..03ff81b 100644
--- a/nladmin-ui/src/views/system/user/index.vue
+++ b/nladmin-ui/src/views/system/user/index.vue
@@ -154,7 +154,11 @@
           <el-table-column prop="gender" label="性别" :min-width="flexWidth('personName',crud.data,'性别')" />
           <el-table-column prop="phone" label="电话" :min-width="flexWidth('phone',crud.data,'电话')" />
           <el-table-column prop="email" label="邮箱" :min-width="flexWidth('email',crud.data,'邮箱')" />
-          <el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
+          <el-table-column show-overflow-tooltip prop="depts" label="部门" >
+            <template slot-scope="scope">
+              <span>{{ scope.row.depts }}</span>
+            </template>
+          </el-table-column>>
           <el-table-column label="状态" align="center" prop="enabled">
             <template slot-scope="scope">
               <span :style="{'color': caseStatusColorFilter(scope.row.isUsed)}">{{ enabledTypeOptions.find(item => {return item.key == scope.row.isUsed}).display_name }}</span>
@@ -318,7 +322,7 @@
 </template>
 
 <script>
-import crudUser from '@/views/system/user'
+import crudUser from '@/views/system/user/user'
 import crudDept from '@/api/system/dept'
 // import crudDataPermission from '@/views/system/permission/dataPermission'
 import { getAll, getLevel } from '@/api/system/role'