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

Merge #132 into master from revert-56b85c33-20f063dc

Browse Source 
Revert commit "Merge #128 into master from cc_20250512_uploadRentContract

* revert-56b85c33-20f063dc: (1 commits squashed)

  - Revert commit "Merge #128 into master from cc_20250512_uploadRentContract
    
    This reverts change request#128

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/132
This commit is contained in:
正新
2026-05-12 09:56:16 +00:00
parent fcb6fb0770
commit 8caf3b1a6a
325 changed files with 262 additions and 14063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml
View File

@@ -214,32 +214,4 @@
</select>
<select id="getBigRegionByUserId" resultType="com.cool.store.dto.BigRegionUserDTO">
select
b.`name` as name,
b.`mobile` as mobiel ,
e.`name` as regionName,
e.id as regionId
from
`user_auth_mapping_${enterpriseId}` a
left join `enterprise_user_${enterpriseId}` b on a.`user_id` = b.`user_id`
left join `enterprise_user_role_${enterpriseId}` c on a.`user_id` = c.`user_id`
left join `sys_role_${enterpriseId}` d on c.`role_id` = d.`id`
left join `region_${enterpriseId}` e on e.id = a.`mapping_id`
<where>
<if test="regionIds!=null and regionIds.size>0">
and a.`mapping_id` in
<foreach collection="regionIds" item="regionId" open="(" separator="," close=")">
#{regionId}
</foreach>
</if>
<if test="roleName!=null and roleName!=''">
and d.`role_name` = #{roleName}
</if>
</where>
</select>
</mapper>