From 9bfdf1ff20086c04bbe6576706bfee95c9d7fea0 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 10:46:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 11 ++++-------
1 files changed, 4 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 64e3777..c4807ed 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -40,9 +40,9 @@
<!--@mbg.generated-->
id, `name`, phone, `password`, supper_admin, disabled, deleted, create_dt
</sql>
- <sql id="part_Column_List">
- ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt
- </sql>
+<!-- <sql id="part_Column_List"><![CDATA[-->
+<!-- ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt-->
+<!-- ]]></sql>-->
<sql id="Login_Column_List">
id, name, phone, supper_admin
</sql>
@@ -76,7 +76,6 @@
select
count(*)
from ba_user
- where supper_admin!=1 and deleted!=1
</select>
<select id="login" resultMap="loginResultMap" >
select
@@ -116,9 +115,7 @@
</select>
<select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
select
- <include refid="part_Column_List" >
- <property name="alias" value="bu"/>
- </include>
+ <include refid="Base_Column_List"/>
from ba_user bu
# left join ba_user_role ur on ur.user_id=bu.id
where bu.supper_admin!=1 and bu.deleted!=1
--
Gitblit v1.8.0