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

Merge #152 into master from cc_20260528_fix

Browse Source 
feat:开业

* cc_20260528_fix: (1 commits squashed)

  - feat:开业

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/152
This commit is contained in:
正新
2026-05-29 01:38:05 +00:00
parent 94ee7b7d12
commit f749f97911
3 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
View File

@@ -451,7 +451,21 @@
</foreach>
</if>
<if test="operationsConsultant!=null and operationsConsultant!=''">
and si.operations_consultant = #{operationsConsultant}
and (
si.operations_consultant = #{operationsConsultant}
<if test="request.authRegionIds != null and request.authRegionIds.size() > 0">
or (
si.region_id in
<foreach collection="request.authRegionIds" item="regionId" index="index" open="(" separator="," close=")">
#{regionId}
</foreach>
or si.invest_region_id in
<foreach collection="request.authRegionIds" item="regionId" index="index" open="(" separator="," close=")">
#{regionId}
</foreach>
)
</if>
)
</if>
<if test="request.shopKeyword !=null and request.shopKeyword !=''">
and (si.shop_name like concat('%',#{request.shopKeyword},'%') or si.shop_code like concat('%',#{request.shopKeyword},'%'))