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

fix：内勤看所有管辖范围的数据

Browse Source
This commit is contained in:
suzhuhong
2026-01-02 12:15:07 +08:00
parent 2eaa1533c2
commit 8f6ed072d1
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -376,16 +376,16 @@
and (a.investment_manager = #{userId} or a.operations_consultant = #{userId}) and (a.investment_manager = #{userId} or a.operations_consultant = #{userId})
</if> </if>
<if test="request.authRegionIds != null and request.authRegionIds.size() > 0"> <if test="request.authRegionIds != null and request.authRegionIds.size() > 0">
and a.region_id in and (
a.region_id in
<foreach collection="request.authRegionIds" item="regionId" index="index" open="(" separator="," close=")"> <foreach collection="request.authRegionIds" item="regionId" index="index" open="(" separator="," close=")">
#{regionId} #{regionId}
</foreach> </foreach>
</if> or a.invest_region_id in
<if test="request.authInvestRegionIds != null and request.authInvestRegionIds.size() > 0"> <foreach collection="request.authRegionIds" item="regionId" index="index" open="(" separator="," close=")">
and a.invest_region_id in #{regionId}
<foreach collection="request.authInvestRegionIds" item="investRegionId" index="index" open="(" separator="," close=")">
#{investRegionId}
</foreach> </foreach>
)
</if> </if>
order by a.update_time desc order by a.update_time desc
</select> </select>

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -549,13 +549,9 @@ public class ShopServiceImpl implements ShopService {
} }
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(userId); List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(userId);
// 招商经理查询招商区域invest_region_id，否则查询运营区域region_id // 招商经理查询招商区域invest_region_id，否则查询运营区域region_id
if (userRoleIds.contains(UserRoleEnum.INVESTMENT_MANGER.getCode())) {
request.setAuthInvestRegionIds(authRegionIds);
} else {
request.setAuthRegionIds(authRegionIds); request.setAuthRegionIds(authRegionIds);
} }
} }
}
if (CollectionUtils.isNotEmpty(request.getRegionIds())) { if (CollectionUtils.isNotEmpty(request.getRegionIds())) {
if (request.getRegionIds().contains(CommonConstants.ROOT_DEPT_ID_STR)) { if (request.getRegionIds().contains(CommonConstants.ROOT_DEPT_ID_STR)) {
request.setRegionIds(null); request.setRegionIds(null);