From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml | 101 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 71 insertions(+), 30 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
index 404bf87..de36f75 100755
--- a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="userServiceDaoImpl">
- <resultMap type="com.java110.entity.user.Cust" id="custMap">
+ <resultMap type="com.java110.dto.user.Cust" id="custMap">
<id column="custId" jdbcType="VARCHAR" property="custId"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="email" jdbcType="VARCHAR" property="email"/>
@@ -18,7 +18,7 @@
<result column="openId" jdbcType="VARCHAR" property="openId"/>
<!-- 涓�瀵瑰鍏崇郴 -->
<!-- <collection property="stus" resultMap="Student.StudentResult"></collection> -->
- <collection property="custAttrs" javaType="com.java110.entity.user.CustAttr">
+ <collection property="custAttrs" javaType="com.java110.dto.user.CustAttr">
<id property="custId" column="custId"/>
<result property="attrCd" column="attrCd"/>
<result property="value" column="value"/>
@@ -38,52 +38,62 @@
</select>
-->
<!--淇濆瓨鏁版嵁鑷宠繃绋嬭〃 bo_cust 涓� -->
- <insert id="saveDataToBoCust" parameterType="com.java110.entity.user.BoCust">
+ <insert id="saveDataToBoCust" parameterType="com.java110.dto.user.BoCust">
<![CDATA[
- insert into bo_cust(boId,custId,name,email,cellphone,realName,sex,password,lanId,custAdress,custType,openId,state)
- values(#{boId},#{custId},#{name},#{email},#{cellphone},#{realName},#{sex},#{password},#{lanId},#{custAdress},#{custType},#{openId},#{state})
+
+ insert into bo_cust(boId,custId,name,email,cellphone,realName,sex,password,lanId,custAdress,custType,openId,state)
+ values(#{boId},#{custId},#{name},#{email},#{cellphone},#{realName},#{sex},#{password},#{lanId},#{custAdress},#{custType},#{openId},#{state})
+
]]>
</insert>
<!-- 淇濆瓨鏁版嵁鑷宠繃绋嬭〃bo_cust_attr 涓�-->
- <insert id="saveDataToBoCustAttr" parameterType="com.java110.entity.user.BoCustAttr">
+ <insert id="saveDataToBoCustAttr" parameterType="com.java110.dto.user.BoCustAttr">
<![CDATA[
- insert into bo_cust_attr(boId,custId,attrCd,value,state)
- values(#{boId},#{custId},#{attrCd},#{value},#{state})
+
+ insert into bo_cust_attr(boId,custId,attrCd,value,state)
+ values(#{boId},#{custId},#{attrCd},#{value},#{state})
+
]]>
</insert>
<!-- 淇濆瓨 瀹炰緥瀹㈡埛淇℃伅 cust -->
- <insert id="saveDataToCust" parameterType="com.java110.entity.user.Cust">
+ <insert id="saveDataToCust" parameterType="com.java110.dto.user.Cust">
<![CDATA[
- insert into cust(custId,name,email,cellphone,realName,sex,password,lanId,custAdress,custType,openId,status_cd)
- values(#{custId},#{name},#{email},#{cellphone},#{realName},#{sex},#{password},#{lanId},#{custAdress},#{custType},#{openId},#{status_cd})
+
+ insert into cust(custId,name,email,cellphone,realName,sex,password,lanId,custAdress,custType,openId,status_cd)
+ values(#{custId},#{name},#{email},#{cellphone},#{realName},#{sex},#{password},#{lanId},#{custAdress},#{custType},#{openId},#{status_cd})
+
]]>
</insert>
<!-- 鍒犻櫎瀹炰緥瀹㈡埛淇℃伅 cust -->
- <insert id="deleteDataToCust" parameterType="com.java110.entity.user.Cust">
+ <insert id="deleteDataToCust" parameterType="com.java110.dto.user.Cust">
<![CDATA[
- delete * from cust c where c.custId = #{custId}
+
+ delete * from cust c where c.custId = #{custId}
+
]]>
</insert>
<!-- 淇濆瓨 瀹炰緥瀹㈡埛灞炴�т俊鎭� cust_attr -->
- <insert id="saveDataToCustAttr" parameterType="com.java110.entity.user.CustAttr">
+ <insert id="saveDataToCustAttr" parameterType="com.java110.dto.user.CustAttr">
<![CDATA[
- insert into cust_attr(custId,attrCd,value,status_cd)
- values(#{custId},#{attrCd},#{value},#{status_cd})
+
+ insert into cust_attr(custId,attrCd,value,status_cd)
+ values(#{custId},#{attrCd},#{value},#{status_cd})
+
]]>
</insert>
<!-- 鍒犻櫎瀹炰緥瀹㈡埛淇℃伅 cust -->
- <update id="deleteDataToCustAttr" parameterType="com.java110.entity.user.CustAttr">
+ <update id="deleteDataToCustAttr" parameterType="com.java110.dto.user.CustAttr">
delete * from cust_attr ct where 1=1
<if test="custId != null and custId != ''">
and ct.custId = #{custId}
@@ -93,7 +103,7 @@
</if>
</update>
<!--鏍规嵁瀹㈡埛ID 鏌ヨ瀹㈡埛淇℃伅锛屽叾涓寘鎷� cust 鍜宑ustAttr 鏁版嵁-->
- <select id="queryDataToCust" parameterType="com.java110.entity.user.Cust" resultMap="custMap">
+ <select id="queryDataToCust" parameterType="com.java110.dto.user.Cust" resultMap="custMap">
select c.custId,c.name,c.email,c.cellphone,c.realName,c.sex,c.password,c.lanId,c.custAdress,c.custType,c.openId,
ca.custId,ca.attrCd,ca.value
@@ -109,7 +119,7 @@
</select>
<!-- 鏌ヨ瀹㈡埛杩囩▼鏁版嵁 -->
- <select id="queryBoCust" parameterType="com.java110.entity.user.BoCust" resultType="com.java110.entity.user.BoCust">
+ <select id="queryBoCust" parameterType="com.java110.dto.user.BoCust" resultType="com.java110.dto.user.BoCust">
select
bc.boId,bc.custId,bc.name,bc.email,bc.cellphone,bc.realName,bc.sex,bc.password,bc.lanId,bc.custAdress,bc.custType,bc.openId,bc.create_dt
from bo_cust bc where 1=1
@@ -128,8 +138,8 @@
</if>
</select>
<!-- 鏌ヨ瀹㈡埛灞炴�ц繃绋嬭〃-->
- <select id="queryBoCustAttr" parameterType="com.java110.entity.user.BoCustAttr"
- resultType="com.java110.entity.user.BoCustAttr">
+ <select id="queryBoCustAttr" parameterType="com.java110.dto.user.BoCustAttr"
+ resultType="com.java110.dto.user.BoCustAttr">
select bca.boId,bca.custId,bca.attrCd,bca.value,bca.state,bca.create_dt from bo_cust_attr bca where 1=1
<if test="boId !=null and boId != ''">
and bca.boId = #{boId}
@@ -146,8 +156,8 @@
</select>
<!-- 鏌ヨ瀹㈡埛灞炴�т俊鎭� -->
- <select id="queryDataToCustAttr" parameterType="com.java110.entity.user.CustAttr"
- resultType="com.java110.entity.user.CustAttr">
+ <select id="queryDataToCustAttr" parameterType="com.java110.dto.user.CustAttr"
+ resultType="com.java110.dto.user.CustAttr">
select * from cust_attr ca where 1=1
<if test="custId != null and custId != ''">
and ca.custId = #{custId}
@@ -455,10 +465,13 @@
<!-- 鏌ヨ鍛樺伐鎬婚噺 -->
<select id="getStaffCount" parameterType="Map" resultType="Map">
+ <if test="orgIds != null and orgIds.length > 0">
+ select count(*) count from(
+ </if>
select count(1) count
from u_user u
inner join s_store_user su on su.user_id = u.user_id
- <if test="orgId !=null and orgId != ''">
+ <if test="(orgId !=null and orgId != '')||(orgIds != null and orgIds.length > 0)">
left join u_org_staff_rel uosr on u.user_id = uosr.staff_id and uosr.status_cd = '0'
left join u_org uo on uosr.org_id = uo.org_id and uo.status_cd = '0'
</if>
@@ -475,6 +488,9 @@
</if>
<if test="name !=null and name != ''">
and u.name like concat('%',#{name},'%')
+ </if>
+ <if test="nameLike !=null and nameLike != ''">
+ and u.name like concat('%',#{nameLike},'%')
</if>
<if test="staffName !=null and staffName != ''">
and u.name like concat('%',#{staffName},'%')
@@ -493,6 +509,17 @@
<foreach collection="userIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
+ </if>
+ <if test="orgIds != null and orgIds.length > 0">
+ and uosr.org_id in
+ <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ and uosr.status_cd =0
+ GROUP BY u.user_id
+ </if>
+ <if test="orgIds != null and orgIds.length > 0">
+ )a
</if>
</select>
@@ -500,14 +527,15 @@
<select id="getStaffs" parameterType="Map" resultType="Map">
select u.user_id, u.user_id userId,u.name,u.name
userName,u.email,u.address,u.location_cd,u.location_cd locationCd,
- u.age,u.sex,u.tel,u.level_cd levelCd,u.b_id
- <if test="storeId !=null and storeId != ''">
- ,uo.org_id orgId,uo.org_name,uo.org_name orgName,uosr.store_id storeId,uosr.rel_cd relCd
+ u.age,u.sex,u.tel,u.level_cd levelCd,u.b_id,su.rel_cd relCd,td.name relCdName
+ <if test="orgId !=null and orgId != ''">
+ ,uo.org_id orgId,uo.org_name,uo.org_name orgName,uosr.store_id storeId,uosr.rel_id relId
</if>
from
u_user u
inner join s_store_user su on su.user_id = u.user_id
- <if test="orgId !=null and orgId != ''">
+ left join t_dict td on su.rel_cd = td.status_cd and td.table_name='s_store_user' and td.table_columns='rel_cd'
+ <if test="(orgId !=null and orgId != '')||(orgIds != null and orgIds.length > 0)">
left join u_org_staff_rel uosr on u.user_id = uosr.staff_id and uosr.status_cd = '0'
left join u_org uo on uosr.org_id = uo.org_id and uo.status_cd = '0'
</if>
@@ -524,6 +552,9 @@
</if>
<if test="name !=null and name != ''">
and u.name like concat('%',#{name},'%')
+ </if>
+ <if test="nameLike !=null and nameLike != ''">
+ and u.name like concat('%',#{nameLike},'%')
</if>
<if test="staffName !=null and staffName != ''">
and u.name like concat('%',#{staffName},'%')
@@ -542,6 +573,15 @@
<foreach collection="userIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
+ </if>
+ <if test="orgIds != null and orgIds.length > 0">
+ and uosr.org_id in
+ <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ and uosr.status_cd =0
+ GROUP BY u.user_id,u.name,u.email,u.address,u.location_cd,
+ u.age,u.sex,u.tel,u.level_cd ,u.b_id,su.rel_cd ,td.name
</if>
order by u.create_time desc
<if test="page != -1 and page != null ">
@@ -565,9 +605,10 @@
,u_user_attr ua
</if>
where 1= 1
+
<if test="openId != null and openId != ''">
and u.user_id = ua.user_id
- and ua.spec_cd = '100201911001'
+ and ua.spec_cd in ('100201911001','100201911003')
and ua.value = #{openId}
and ua.status_cd = '0'
</if>
@@ -653,7 +694,7 @@
where 1= 1
<if test="openId != null and openId != ''">
and u.user_id = ua.user_id
- and ua.spec_cd = '100201911001'
+ and ua.spec_cd in ('100201911001','100201911003')
and ua.value = #{openId}
and ua.status_cd = '0'
</if>
--
Gitblit v1.8.0