From 31ee5f69f4e8f3d2620be1f4440a593e97eea946 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 16 十一月 2022 17:57:01 +0800
Subject: [PATCH] 导出bug
---
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 106 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 90 insertions(+), 16 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index 50b91ba..78369f0 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -4,25 +4,99 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdmin">
- <id column="id" property="id" />
- <result column="username" property="username" />
- <result column="password" property="password" />
- <result column="icon" property="icon" />
- <result column="email" property="email" />
- <result column="nick_name" property="nickName" />
- <result column="note" property="note" />
- <result column="create_time" property="createTime" />
- <result column="login_time" property="loginTime" />
- <result column="status" property="status" />
+ <id column="id" property="id"/>
+ <result column="username" property="username"/>
+ <result column="password" property="password"/>
+ <result column="icon" property="icon"/>
+ <result column="email" property="email"/>
+ <result column="nick_name" property="nickName"/>
+ <result column="sex" property="sex"/>
+ <result column="note" property="note"/>
+ <result column="create_time" property="createTime"/>
+ <result column="login_time" property="loginTime"/>
+ <result column="status" property="status"/>
+ <result column="mac_address" property="macAddress"/>
+ <result column="ip_address" property="ipAddress"/>
+ <result column="is_dy" property="isDy"/>
+ <result column="job_title" property="jobTitle"/>
+ <result column="user_type" property="userType"/>
+ <result column="zj" property="zj"/>
+ <result column="mobile" property="mobile"/>
+ </resultMap>
+ <resultMap type="com.ycl.entity.user.UmsAdmin" id="CondMapResultMap" extends="BaseResultMap">
+ <collection property="depart" javaType="ArrayList" ofType="com.ycl.entity.depart.UmsDepart">
+ <id column="depart_id" property="id"/>
+ <result column="depart_name" property="departName"/>
+ <result column="depart_des" property="departDes"/>
+ <result column="depart_type" property="departType"/>
+ <result column="parent_id" property="parentId"/>
+ <result column="depart_status" property="status"/>
+ <result column="depart_create_time" property="createTime"/>
+ <result column="depart_update_time" property="updateTime"/>
+ <result column="is_deleted" property="isDeleted"/>
+ </collection>
+ <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id"
+ select="selectAdminRoles">
+ <id column="role_id" property="id"/>
+ <result column="name" property="name"/>
+ <result column="description" property="description"/>
+ <result column="admin_count" property="adminCount"/>
+ <result column="role_create_time" property="createTime"/>
+ <result column="role_status" property="status"/>
+ <result column="sort" property="sort"/>
+ </collection>
</resultMap>
<select id="getAdminIdList" resultType="java.lang.Long">
- SELECT
- DISTINCT ar.admin_id
- FROM
- ums_role_resource_relation rr
- LEFT JOIN ums_admin_role_relation ar ON rr.role_id = ar.role_id
- WHERE rr.resource_id=#{resourceId}
+ SELECT DISTINCT ar.admin_id
+ FROM ums_role_resource_relation rr
+ LEFT JOIN ums_admin_role_relation ar ON rr.role_id = ar.role_id
+ WHERE rr.resource_id = #{resourceId}
</select>
+ <select id="selectCondPage" parameterType="com.ycl.entity.user.UmsAdmin" resultMap="CondMapResultMap">
+ SELECT
+ ua.*,
+ ud.id depart_id,
+ ud.depart_name,
+ ud.depart_des,
+ ud.depart_type,
+ ud.parent_id,
+ ud.create_time depat_create_time,
+ ud.update_time depat_update_time,
+ ud.STATUS depart_status,
+ ud.is_deleted
+ FROM
+ ums_admin ua
+ LEFT JOIN ums_depart_manager udm ON ua.id = udm.user_id
+ LEFT JOIN ums_depart ud ON udm.depart_id = ud.id
+ <where>
+ <if test="umsAdmin.keyword !=null and umsAdmin.keyword !=''">
+ AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
+ or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
+ or ua.mobile LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%'))
+ </if>
+ <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 ">
+ AND ua.user_type = #{umsAdmin.userType}
+ </if>
+ <if test="umsAdmin.jobTitle !=null and umsAdmin.keyword !=''">
+ AND ua.job_title = #{umsAdmin.jobTitle}
+ </if>
+ </where>
+ ORDER BY
+ ua.id DESC
+ </select>
+ <select id="selectAdminRoles" parameterType="java.lang.Long" resultType="com.ycl.entity.user.UmsRole">
+ select ur.id role_id,
+ ur.name NAME,
+ ur.description,
+ ur.admin_count,
+ ur.create_time role_create_time,
+ ur.STATUS role_status,
+ ur.sort
+ from ums_admin ua
+ LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id
+ left join ums_role ur on uarr.role_id = ur.id
+ where ua.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.8.0