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

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
shuo.wang
2025-04-05 15:55:54 +08:00
parent 2b671debaa b70f47853c
commit 6c39f6fa41
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -480,7 +480,7 @@
<if test="wantShopAreaName != null">
left join xfsg_open_area_info b on a.want_shop_area_id = b.id
</if>
where a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2) and c.deleted = 0
where a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2) and ( c.deleted = 0 or c.deleted is null)
<if test="userId != null and userId != ''">
and (a.investment_manager = #{userId} or c.investment_manager = #{userId} )
</if>