From 2728dc8b359aa0a600db8ed73539ec888c454b83 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 18 六月 2024 11:15:20 +0800
Subject: [PATCH] PrProductionNode table add node_type

---
 pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml |   35 +++++++++++++++++++++++++----------
 1 files changed, 25 insertions(+), 10 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 b4adcd1..6062cef 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -11,6 +11,7 @@
     <result column="supper_admin" property="supperAdmin" />
     <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
     <result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
+    <result column="create_dt" property="dt" />
   </resultMap>
   <resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaUser">
     <!--@mbg.generated-->
@@ -20,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" />
@@ -36,15 +38,18 @@
 
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, `name`, phone, `password`, supper_admin, disabled, deleted
+    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}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt
   </sql>
   <sql id="Login_Column_List">
     id, name, phone, supper_admin
   </sql>
 
+  <select id="selectNameByUserId" parameterType="java.lang.Long" resultType="java.lang.String">
+    select name from ba_user where id=#{id}
+  </select>
   <select id="selectCount" resultType="java.lang.Long">
     select
       count(*)
@@ -71,17 +76,20 @@
     select
     count(*)
     from ba_user bu
-    inner 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 != ''">
         bu.name like concat('%', #{name}, '%') and
       </if>
       <if test="phone != null and phone !=''">
-        bu.phone = #{phone,jdbcType=VARCHAR}
+        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>
@@ -91,17 +99,20 @@
       <property name="alias" value="bu"/>
     </include>
     from ba_user bu
-    inner 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 != ''">
         bu.name like concat('%', #{name}, '%') and
       </if>
       <if test="phone != null and phone !=''">
-        bu.phone = #{phone,jdbcType=VARCHAR}
+        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>
     order by id DESC
@@ -112,6 +123,10 @@
     </trim>
   </select>
 
+  <select id="selectNameById" parameterType="java.lang.Long" resultType="java.lang.String">
+    select name from ba_user where id=#{id}
+  </select>
+
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->

--
Gitblit v1.8.0