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

Merge branch 'cc_20251005_fuck' into 'master'

Browse Source 
feat:大区总

See merge request hangzhou/java/custom_zxjp!166
This commit is contained in:
苏竹红
2025-10-05 12:01:10 +00:00
parent e13ffcdb55 3fbac3c28b
commit 740f365a18
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -397,7 +397,7 @@
and eu.active = true and eu.active = true
-- and sr.source = 'create' -- and sr.source = 'create'
<if test="positionType != null and positionType != '' "> <if test="positionType != null and positionType != '' ">
and (sr.position_type = #{positionType} or sr.id = 180000000) and (sr.position_type = #{positionType} or sr.id in (180000000,120000000,40000000))
</if> </if>
and eu.user_status = '1' and eu.user_status = '1'
</select> </select>

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

@@ -55,7 +55,7 @@
</foreach> </foreach>
</if> </if>
<if test="positionType!=null and positionType!=''"> <if test="positionType!=null and positionType!=''">
and (b.position_type =#{positionType} or b.id = 180000000 ) and (b.position_type =#{positionType} or b.id in (180000000,120000000,40000000) )
</if> </if>
<if test="notRoleAuth!=null and notRoleAuth!=''"> <if test="notRoleAuth!=null and notRoleAuth!=''">
and b.role_auth !=#{notRoleAuth} and b.role_auth !=#{notRoleAuth}