From 14255942c7a30ddac8f513c91b026ae34e17cfde Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 五月 2024 17:55:26 +0800
Subject: [PATCH] 完善代码
---
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index 6c0c90b..b03de62 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -21,6 +21,7 @@
<result property="phone" column="phone"/>
<result property="password" column="password"/>
<result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
+ <result column="create_dt" property="dt" />
</resultMap>
<resultMap id="oneResultMap" type="com.dy.pmsGlobal.pojoBa.BaUser" extends="BaseResultMap">
<collection property="roles" fetchType="eager" column="{userId=id}" select="com.dy.pmsGlobal.daoBa.BaRoleMapper.selectByUserId" />
@@ -72,7 +73,7 @@
select
count(*)
from ba_user bu
- left join ba_user_role ur on ur.user_id=bu.id
+# left join ba_user_role ur on ur.user_id=bu.id
where bu.supper_admin!=1 and bu.deleted!=1
<trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
@@ -81,8 +82,11 @@
<if test="phone != null and phone !=''">
bu.phone = #{phone,jdbcType=VARCHAR} and
</if>
- <if test="roleId != null">
- ur.role_id=#{roleId,jdbcType=BIGINT}
+<!-- <if test="roleId != null">-->
+<!-- ur.role_id=#{roleId,jdbcType=BIGINT} and-->
+<!-- </if>-->
+ <if test="disabled != null">
+ bu.disabled=#{disabled,jdbcType=BOOLEAN}
</if>
</trim>
</select>
@@ -92,7 +96,7 @@
<property name="alias" value="bu"/>
</include>
from ba_user bu
- left join ba_user_role ur on ur.user_id=bu.id
+# left join ba_user_role ur on ur.user_id=bu.id
where bu.supper_admin!=1 and bu.deleted!=1
<trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
@@ -101,9 +105,9 @@
<if test="phone != null and phone !=''">
bu.phone = #{phone,jdbcType=VARCHAR} and
</if>
- <if test="roleId != null">
- ur.role_id=#{roleId,jdbcType=BIGINT} and
- </if>
+<!-- <if test="roleId != null">-->
+<!-- ur.role_id=#{roleId,jdbcType=BIGINT} and-->
+<!-- </if>-->
<if test="disabled != null">
bu.disabled=#{disabled,jdbcType=BOOLEAN}
</if>
--
Gitblit v1.8.0