From 745d27feae34022ccb708aba034123e08e4e9e14 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/OwnerAppUserV1ServiceDaoImplMapper.xml |  341 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 170 insertions(+), 171 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/OwnerAppUserV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerAppUserV1ServiceDaoImplMapper.xml
index a031e84..9fcc5a7 100644
--- a/java110-db/src/main/resources/mapper/user/OwnerAppUserV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerAppUserV1ServiceDaoImplMapper.xml
@@ -5,192 +5,191 @@
 <mapper namespace="ownerAppUserV1ServiceDaoImpl">
 
 
-
-
-
-    <!-- 淇濆瓨涓氫富鐢ㄦ埛灏忓尯鍏崇郴淇℃伅 add by wuxw 2018-07-03 -->
+    <!-- 淇濆瓨涓氫富缁戝畾淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveOwnerAppUserInfo" parameterType="Map">
         insert into owner_app_user(
-id_card,open_id,link,remark,user_id,app_type,app_user_name,nickname,headimgurl,community_name,state,app_user_id,community_id,app_type_cd,member_id,b_id
-) values (
-#{idCard},#{openId},#{link},#{remark},#{userId},#{appType},#{appUserName},#{nickname},#{headimgurl},#{communityName},#{state},#{appUserId},#{communityId},#{appTypeCd},#{memberId},#{bId}
-)
+        id_card,open_id,link,remark,user_id,app_type,app_user_name,nickname,headimgurl,community_name,state,app_user_id,community_id,app_type_cd,member_id
+        ) values (
+        #{idCard},#{openId},#{link},#{remark},#{userId},#{appType},#{appUserName},#{nickname},#{headimgurl},#{communityName},#{state},#{appUserId},#{communityId},#{appTypeCd},#{memberId}
+        )
     </insert>
 
 
-
-    <!-- 鏌ヨ涓氫富鐢ㄦ埛灏忓尯鍏崇郴淇℃伅 add by wuxw 2018-07-03 -->
+    <!-- 鏌ヨ涓氫富缁戝畾淇℃伅 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.user_id,t.user_id userId,t.app_type,t.app_type appType,t.app_user_name,t.app_user_name appUserName,t.nickname,t.headimgurl,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.member_id,t.member_id memberId 
-from owner_app_user t 
-where 1 =1 
-<if test="idCard !=null and idCard != ''">
-   and t.id_card= #{idCard}
-</if> 
-<if test="openId !=null and openId != ''">
-   and t.open_id= #{openId}
-</if> 
-<if test="link !=null and link != ''">
-   and t.link= #{link}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="appType !=null and appType != ''">
-   and t.app_type= #{appType}
-</if> 
-<if test="appUserName !=null and appUserName != ''">
-   and t.app_user_name= #{appUserName}
-</if> 
-<if test="nickname !=null and nickname != ''">
-   and t.nickname= #{nickname}
-</if> 
-<if test="headimgurl !=null and headimgurl != ''">
-   and t.headimgurl= #{headimgurl}
-</if> 
-<if test="communityName !=null and communityName != ''">
-   and t.community_name= #{communityName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="appUserId !=null and appUserId != ''">
-   and t.app_user_id= #{appUserId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="appTypeCd !=null and appTypeCd != ''">
-   and t.app_type_cd= #{appTypeCd}
-</if> 
-<if test="memberId !=null and memberId != ''">
-   and t.member_id= #{memberId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        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.user_id,t.user_id userId,t.app_type,t.app_type appType,t.app_user_name,t.app_user_name
+        appUserName,t.nickname,t.headimgurl,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.member_id,t.member_id memberId
+        from owner_app_user t
+        where 1 =1
+        <if test="idCard !=null and idCard != ''">
+            and t.id_card= #{idCard}
+        </if>
+        <if test="openId !=null and openId != ''">
+            and t.open_id= #{openId}
+        </if>
+        <if test="link !=null and link != ''">
+            and t.link= #{link}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="appType !=null and appType != ''">
+            and t.app_type= #{appType}
+        </if>
+        <if test="appUserName !=null and appUserName != ''">
+            and t.app_user_name= #{appUserName}
+        </if>
+        <if test="nickname !=null and nickname != ''">
+            and t.nickname= #{nickname}
+        </if>
+        <if test="headimgurl !=null and headimgurl != ''">
+            and t.headimgurl= #{headimgurl}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name= #{communityName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="appUserId !=null and appUserId != ''">
+            and t.app_user_id= #{appUserId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="appTypeCd !=null and appTypeCd != ''">
+            and t.app_type_cd= #{appTypeCd}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
-    <!-- 淇敼涓氫富鐢ㄦ埛灏忓尯鍏崇郴淇℃伅 add by wuxw 2018-07-03 -->
+    <!-- 淇敼涓氫富缁戝畾淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateOwnerAppUserInfo" parameterType="Map">
-        update  owner_app_user t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="idCard !=null and idCard != ''">
-, t.id_card= #{idCard}
-</if> 
-<if test="openId !=null and openId != ''">
-, t.open_id= #{openId}
-</if> 
-<if test="link !=null and link != ''">
-, t.link= #{link}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
-<if test="appType !=null and appType != ''">
-, t.app_type= #{appType}
-</if> 
-<if test="appUserName !=null and appUserName != ''">
-, t.app_user_name= #{appUserName}
-</if> 
-<if test="nickname !=null and nickname != ''">
-, t.nickname= #{nickname}
-</if> 
-<if test="headimgurl !=null and headimgurl != ''">
-, t.headimgurl= #{headimgurl}
-</if> 
-<if test="communityName !=null and communityName != ''">
-, t.community_name= #{communityName}
-</if> 
-<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> 
-<if test="memberId !=null and memberId != ''">
-, t.member_id= #{memberId}
-</if> 
- where 1=1 <if test="appUserId !=null and appUserId != ''">
-and t.app_user_id= #{appUserId}
-</if> 
+        update owner_app_user t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="idCard !=null and idCard != ''">
+            , t.id_card= #{idCard}
+        </if>
+        <if test="openId !=null and openId != ''">
+            , t.open_id= #{openId}
+        </if>
+        <if test="link !=null and link != ''">
+            , t.link= #{link}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        <if test="appType !=null and appType != ''">
+            , t.app_type= #{appType}
+        </if>
+        <if test="appUserName !=null and appUserName != ''">
+            , t.app_user_name= #{appUserName}
+        </if>
+        <if test="nickname !=null and nickname != ''">
+            , t.nickname= #{nickname}
+        </if>
+        <if test="headimgurl !=null and headimgurl != ''">
+            , t.headimgurl= #{headimgurl}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            , t.community_name= #{communityName}
+        </if>
+        <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>
+        <if test="memberId !=null and memberId != ''">
+            , t.member_id= #{memberId}
+        </if>
+        where 1=1
+        <if test="appUserId !=null and appUserId != ''">
+            and t.app_user_id= #{appUserId}
+        </if>
 
     </update>
 
-    <!-- 鏌ヨ涓氫富鐢ㄦ埛灏忓尯鍏崇郴鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryOwnerAppUsersCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from owner_app_user t 
-where 1 =1 
-<if test="idCard !=null and idCard != ''">
-   and t.id_card= #{idCard}
-</if> 
-<if test="openId !=null and openId != ''">
-   and t.open_id= #{openId}
-</if> 
-<if test="link !=null and link != ''">
-   and t.link= #{link}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="appType !=null and appType != ''">
-   and t.app_type= #{appType}
-</if> 
-<if test="appUserName !=null and appUserName != ''">
-   and t.app_user_name= #{appUserName}
-</if> 
-<if test="nickname !=null and nickname != ''">
-   and t.nickname= #{nickname}
-</if> 
-<if test="headimgurl !=null and headimgurl != ''">
-   and t.headimgurl= #{headimgurl}
-</if> 
-<if test="communityName !=null and communityName != ''">
-   and t.community_name= #{communityName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="appUserId !=null and appUserId != ''">
-   and t.app_user_id= #{appUserId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="appTypeCd !=null and appTypeCd != ''">
-   and t.app_type_cd= #{appTypeCd}
-</if> 
-<if test="memberId !=null and memberId != ''">
-   and t.member_id= #{memberId}
-</if> 
+    <!-- 鏌ヨ涓氫富缁戝畾鏁伴噺 add by wuxw 2018-07-03 -->
+    <select id="queryOwnerAppUsersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from owner_app_user t
+        where 1 =1
+        <if test="idCard !=null and idCard != ''">
+            and t.id_card= #{idCard}
+        </if>
+        <if test="openId !=null and openId != ''">
+            and t.open_id= #{openId}
+        </if>
+        <if test="link !=null and link != ''">
+            and t.link= #{link}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="appType !=null and appType != ''">
+            and t.app_type= #{appType}
+        </if>
+        <if test="appUserName !=null and appUserName != ''">
+            and t.app_user_name= #{appUserName}
+        </if>
+        <if test="nickname !=null and nickname != ''">
+            and t.nickname= #{nickname}
+        </if>
+        <if test="headimgurl !=null and headimgurl != ''">
+            and t.headimgurl= #{headimgurl}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name= #{communityName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="appUserId !=null and appUserId != ''">
+            and t.app_user_id= #{appUserId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="appTypeCd !=null and appTypeCd != ''">
+            and t.app_type_cd= #{appTypeCd}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0