From 623397a394196189057db9c1948fe3b24f7fa4e3 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 24 七月 2024 15:34:14 +0800
Subject: [PATCH] 生产线和工站添加启用禁用的校验
---
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 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 66b8221..64e3777 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" />
@@ -46,6 +47,31 @@
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="selectNameById" parameterType="java.lang.Long" resultType="java.lang.String">
+ select name from ba_user where id=#{id}
+ </select>
+
+ <select id="selectByAssistants" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM
+ ba_user
+ WHERE
+ id IN (
+ SELECT
+ SUBSTRING_INDEX( SUBSTRING_INDEX( #{assistants,jdbcType=VARCHAR}, ',', help_topic_id + 1 ), ',',- 1 ) AS num
+ FROM
+ mysql.help_topic
+ WHERE
+ help_topic_id <![CDATA[ < ]]> LENGTH( #{assistants,jdbcType=VARCHAR} )- LENGTH(
+ REPLACE ( #{assistants,jdbcType=VARCHAR}, ',', '' ))+ 1
+ )
+ </select>
+
<select id="selectCount" resultType="java.lang.Long">
select
count(*)
@@ -64,15 +90,14 @@
select
<include refid="Base_Column_List" />
from ba_user
- where id = #{id}
+ where id = #{id} and deleted!=1
</select>
-
<select id="selectSomeCount" parameterType="java.util.Map" resultType="java.lang.Long">
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 != ''">
@@ -81,8 +106,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 +120,7 @@
<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 != ''">
@@ -101,9 +129,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>
@@ -115,11 +143,14 @@
</if>
</trim>
</select>
-
- <select id="selectNameById" parameterType="java.lang.Long" resultType="java.lang.String">
- select name from ba_user where id=#{id}
+ <select id="selectNamesByAssistants" parameterType="java.lang.String" resultType="java.lang.String">
+ SELECT GROUP_CONCAT(name) AS assistantNames FROM ba_user WHERE id IN
+ <if test="assistants != null">
+ <foreach collection="assistants.split(',')" item="item" separator="," open="(" close=")">
+ #{item,jdbcType=BIGINT}
+ </foreach>
+ </if>
</select>
-
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
--
Gitblit v1.8.0