From 6d7f1adea87fd31788893b0cdbc0c60755b969bd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 20 七月 2023 22:37:51 +0800
Subject: [PATCH] !398 修改代码生成模板，调整打开对话框和接口请求顺序 Merge pull request !398 from 小驴/5.X
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 92d8c9e..0b67a33 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -2,22 +2,27 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
+<mapper namespace="org.dromara.system.mapper.SysUserMapper">
<!-- 澶氱粨鏋勫祵濂楄嚜鍔ㄦ槧灏勯渶甯︿笂姣忎釜瀹炰綋鐨勪富閿甶d 鍚﹀垯鏄犲皠浼氬け璐� -->
- <resultMap type="com.ruoyi.system.domain.vo.SysUserVo" id="SysUserResult">
+ <resultMap type="org.dromara.system.domain.vo.SysUserVo" id="SysUserResult">
<id property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<association property="dept" column="dept_id" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
- <resultMap id="deptResult" type="com.ruoyi.system.domain.vo.SysDeptVo">
+ <resultMap id="deptResult" type="org.dromara.system.domain.vo.SysDeptVo">
<id property="deptId" column="dept_id"/>
+ <id property="email" column="dept_email"/>
+ <id property="status" column="dept_status"/>
+ <id property="createTime" column="dept_create_time"/>
</resultMap>
- <resultMap id="RoleResult" type="com.ruoyi.system.domain.vo.SysRoleVo">
+ <resultMap id="RoleResult" type="org.dromara.system.domain.vo.SysRoleVo">
<id property="roleId" column="role_id"/>
+ <id property="status" column="role_status"/>
+ <id property="createTime" column="role_create_time"/>
</resultMap>
<sql id="selectUserVo">
@@ -46,6 +51,8 @@
d.order_num,
d.leader,
d.status as dept_status,
+ d.email as dept_email,
+ d.create_time as dept_cteate_time,
r.role_id,
r.role_name,
r.role_key,
--
Gitblit v1.9.3