From c164391dbea0c8fea4c9ac5579d2a450f02af0f1 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 14 六月 2024 09:28:43 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index 88714b1..e2e5d47 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -13,8 +13,10 @@
<result property="password" column="password"/>
<result property="orgTag" column="orgTag"/>
<result property="supperAdmin" column="supperAdmin"/>
- <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
- <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
+ <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+ javaType="com.dy.common.mybatis.envm.Disabled"/>
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+ javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
<resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
@@ -267,7 +269,7 @@
SELECT
COUNT(*) AS recordCount
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
@@ -300,7 +302,7 @@
CAST(blockId AS char) AS blockId,
(SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
--
Gitblit v1.8.0