From 9feb0f92711c426ca024ec2000e3fac15eff120b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 六月 2021 13:06:06 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 6615f94..b1cc920
--- a/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
@@ -7,10 +7,10 @@
<!-- 淇濆瓨缁戝畾涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessOwnerAppUserInfo" parameterType="Map">
insert into business_owner_app_user(
- id_card,open_id,link,remark,operate,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id,app_type
+ id_card,open_id,link,remark,operate,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id,app_type,nickname,headimgurl
) values (
#{idCard},#{openId},#{link},#{remark},#{operate},#{appUserName},#{communityName},#{state},#{appUserId},#{communityId},
- #{appTypeCd},#{bId},#{memberId},#{userId},#{appType}
+ #{appTypeCd},#{bId},#{memberId},#{userId},#{appType},#{nickName},#{headImgUrl}
)
</insert>
@@ -21,7 +21,7 @@
openId,t.link,t.remark,t.operate,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
communityName,t.state,t.app_user_id,t.app_user_id appUserId,t.community_id,t.community_id
communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,t.user_id,
- t.user_id userId,t.app_type,t.app_type appType
+ t.user_id userId,t.app_type,t.app_type appType,t.nickname,t.nickname nickName,t.headimgurl,t.headimgurl headImgUrl
from business_owner_app_user t
where 1 =1
<if test="idCard !=null and idCard != ''">
@@ -74,10 +74,10 @@
<insert id="saveOwnerAppUserInfoInstance" parameterType="Map">
insert into owner_app_user(
id_card,open_id,link,remark,status_cd,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id,
- app_type
+ app_type,nickname,headimgurl
) select
t.id_card,t.open_id,t.link,t.remark,'0',t.app_user_name,t.community_name,t.state,t.app_user_id,t.community_id,t.app_type_cd,t.b_id,
- t.member_id,t.user_id,t.app_type
+ t.member_id,t.user_id,t.app_type,t.nickname,t.headimgurl
from business_owner_app_user t where 1=1
<if test="idCard !=null and idCard != ''">
and t.id_card= #{idCard}
@@ -119,6 +119,12 @@
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
+ <if test="nickName !=null and nickName != ''">
+ and t.nickname= #{nickName}
+ </if>
+ <if test="headImgUrl !=null and headImgUrl != ''">
+ and t.headimgurl= #{headImgUrl}
+ </if>
</insert>
@@ -126,15 +132,19 @@
<!-- 鏌ヨ缁戝畾涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOwnerAppUserInfo" parameterType="Map" resultType="Map">
select t.id_card,t.id_card idCard,t.open_id,t.open_id openId,t.link,t.remark,t.status_cd,t.status_cd
- statusCd,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
+ statusCd,t.nickname,t.headimgurl,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
communityName,t.state,t.app_user_id,t.app_user_id appUserId,t.community_id,t.community_id
communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,
- td1.name stateName,t.user_id,t.user_id userId,t.app_type,t.app_type appType,t.create_time createTime
- from owner_app_user t,t_dict td1
+ td1.name stateName,t.user_id,t.user_id userId,t.app_type,t.app_type appType,t.create_time createTime,
+ bo.owner_id ownerId
+ from owner_app_user t,t_dict td1,building_owner bo
where 1 =1
and t.state = td1.status_cd
and td1.table_name = 'owner_app_user'
and td1.table_columns = 'state'
+ and t.member_id = bo.member_id
+ and t.community_id = bo.community_id
+ and bo.status_cd = '0'
<if test="idCard !=null and idCard != ''">
and t.id_card= #{idCard}
</if>
@@ -229,9 +239,6 @@
<if test="state !=null and state != ''">
, t.state= #{state}
</if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
- </if>
<if test="appTypeCd !=null and appTypeCd != ''">
, t.app_type_cd= #{appTypeCd}
</if>
@@ -244,10 +251,22 @@
<if test="appType !=null and appType != ''">
, t.app_type = #{appType}
</if>
+ <if test="nickName !=null and nickName != ''">
+ , t.nickname= #{nickName}
+ </if>
+ <if test="headImgUrl !=null and headImgUrl != ''">
+ , t.headimgurl= #{headImgUrl}
+ </if>
where 1=1
<if test="appUserId !=null and appUserId != ''">
and t.app_user_id= #{appUserId}
</if>
+ <if test="memberId !=null and memberId != ''">
+ and t.member_id= #{memberId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
--
Gitblit v1.8.0