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 | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
index 58ea698..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,7 +38,7 @@
</select>
-->
<!--淇濆瓨鏁版嵁鑷宠繃绋嬭〃 bo_cust 涓� -->
- <insert id="saveDataToBoCust" parameterType="com.java110.entity.user.BoCust">
+ <insert id="saveDataToBoCust" parameterType="com.java110.dto.user.BoCust">
<![CDATA[
@@ -49,7 +49,7 @@
]]>
</insert>
<!-- 淇濆瓨鏁版嵁鑷宠繃绋嬭〃bo_cust_attr 涓�-->
- <insert id="saveDataToBoCustAttr" parameterType="com.java110.entity.user.BoCustAttr">
+ <insert id="saveDataToBoCustAttr" parameterType="com.java110.dto.user.BoCustAttr">
<![CDATA[
@@ -60,7 +60,7 @@
]]>
</insert>
<!-- 淇濆瓨 瀹炰緥瀹㈡埛淇℃伅 cust -->
- <insert id="saveDataToCust" parameterType="com.java110.entity.user.Cust">
+ <insert id="saveDataToCust" parameterType="com.java110.dto.user.Cust">
<![CDATA[
@@ -71,7 +71,7 @@
]]>
</insert>
<!-- 鍒犻櫎瀹炰緥瀹㈡埛淇℃伅 cust -->
- <insert id="deleteDataToCust" parameterType="com.java110.entity.user.Cust">
+ <insert id="deleteDataToCust" parameterType="com.java110.dto.user.Cust">
<![CDATA[
@@ -82,7 +82,7 @@
</insert>
<!-- 淇濆瓨 瀹炰緥瀹㈡埛灞炴�т俊鎭� cust_attr -->
- <insert id="saveDataToCustAttr" parameterType="com.java110.entity.user.CustAttr">
+ <insert id="saveDataToCustAttr" parameterType="com.java110.dto.user.CustAttr">
<![CDATA[
@@ -93,7 +93,7 @@
]]>
</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}
@@ -103,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
@@ -119,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
@@ -138,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}
@@ -156,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}
@@ -489,6 +489,9 @@
<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},'%')
</if>
@@ -550,6 +553,9 @@
<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},'%')
</if>
--
Gitblit v1.8.0