java110 4 lat temu
rodzic
commit
eb990a904d

+ 14 - 5
java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml

@@ -21,7 +21,8 @@
         openId,t.link,t.remark,t.operate,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
         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
         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,
         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.nickname,t.nickname nickName,t.headimgurl,t.headimgurl headImgUrl
+        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
         from business_owner_app_user t
         where 1 =1
         where 1 =1
         <if test="idCard !=null and idCard != ''">
         <if test="idCard !=null and idCard != ''">
@@ -138,8 +139,10 @@
         td1.name stateName,t.user_id,t.user_id userId,t.app_type,t.app_type appType,t.create_time createTime,
         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,bo.owner_type_cd ownerTypeCd
         bo.owner_id ownerId,bo.owner_type_cd ownerTypeCd
         from owner_app_user t
         from owner_app_user t
-        left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'owner_app_user' and td1.table_columns = 'state'
-        left join building_owner bo on t.member_id = bo.member_id and t.community_id = bo.community_id and bo.status_cd = '0'
+        left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'owner_app_user' and td1.table_columns =
+        'state'
+        left join building_owner bo on t.member_id = bo.member_id and t.community_id = bo.community_id and bo.status_cd
+        = '0'
         where 1 =1
         where 1 =1
         <if test="idCard !=null and idCard != ''">
         <if test="idCard !=null and idCard != ''">
             and t.id_card= #{idCard}
             and t.id_card= #{idCard}
@@ -193,10 +196,13 @@
         <if test="userIds !=null">
         <if test="userIds !=null">
             and t.user_id in
             and t.user_id in
             <foreach collection="userIds" open="(" close=")"
             <foreach collection="userIds" open="(" close=")"
-                     separator=","  item="item">
+                     separator="," item="item">
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
         order by t.create_time desc
         order by t.create_time desc
         <if test="page != -1 and page != null ">
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
             limit #{page}, #{row}
@@ -320,10 +326,13 @@
         <if test="userIds !=null">
         <if test="userIds !=null">
             and t.user_id in
             and t.user_id in
             <foreach collection="userIds" open="(" close=")"
             <foreach collection="userIds" open="(" close=")"
-                     separator=","  item="item">
+                     separator="," item="item">
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
 
 
 
 
     </select>
     </select>

+ 6 - 0
java110-db/src/main/resources/mapper/user/OwnerAppUserV1ServiceDaoImplMapper.xml

@@ -69,6 +69,9 @@
         <if test="memberId !=null and memberId != ''">
         <if test="memberId !=null and memberId != ''">
             and t.member_id= #{memberId}
             and t.member_id= #{memberId}
         </if>
         </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
         order by t.create_time desc
         order by t.create_time desc
         <if test="page != -1 and page != null ">
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
             limit #{page}, #{row}
@@ -182,6 +185,9 @@
         <if test="memberId !=null and memberId != ''">
         <if test="memberId !=null and memberId != ''">
             and t.member_id= #{memberId}
             and t.member_id= #{memberId}
         </if>
         </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
 
 
 
 
     </select>
     </select>

+ 5 - 3
service-api/src/main/java/com/java110/api/listener/owner/ListAppUserBindingOwnersListener.java

@@ -75,11 +75,13 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
             reqJson.put("row", 10);
             reqJson.put("row", 10);
         }
         }
 
 
-        OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
-        if (headers.containsKey("userid")) {//这里微信小程序
-            ownerAppUserDto.setUserId(headers.get("userid"));
+        if (!reqJson.containsKey("userId") && headers.containsKey("userid")) {
+            reqJson.put("userId", headers.get("userid"));
         }
         }
 
 
+        OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
+
+
         int count = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsersCount(ownerAppUserDto);
         int count = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsersCount(ownerAppUserDto);