suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106

Browse Source
This commit is contained in:
feng.li
2023-10-26 17:51:12 +08:00
parent 3e0b0321f3 d6d71b76f6
commit d2c24e307a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -614,7 +614,7 @@
</foreach>
</if>
<if test="userPortraitQueryType!=null and userPortraitQueryType=='blank'">
bi.user_portrait is null
AND bi.user_portrait is null
</if>
<if test="userChannelIdList!=null and userChannelIdList.size>0 and userChannelQueryType!=null and userChannelQueryType == 'contains' ">
@@ -628,7 +628,7 @@
</foreach>
</if>
<if test="userChannelQueryType!=null and userChannelQueryType == 'blank' ">
hpuinfo.user_channel_id is null
AND hpuinfo.user_channel_id is null
</if>
<if test="userIdList!=null and userIdList.size==0 and developmentManagerList!=null and developmentManagerList.size>0">
<foreach collection="developmentManagerList" item="developmentManager" open="and hpli.development_manager in (" close=")" separator=",">