wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 11:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

分页问题优化

Browse Source
This commit is contained in:
wuyibo
2023-07-20 15:28:10 +08:00
parent ca6512e483
commit 55c8cbd33e
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
@@ -161,12 +162,11 @@ public class WxBuildingInfoServiceImpl implements IWxBuildingInfoService
@Override @Override
public List<WxBuildingInfo> getAuditPage(WxBuildingInfo buildingInfo) { public List<WxBuildingInfo> getAuditPage(WxBuildingInfo buildingInfo) {
LoginUser user = SecurityUtils.getLoginUser(); LoginUser user = SecurityUtils.getLoginUser();
System.out.println("user="+ JSON.toJSONString(user)); // System.out.println("user="+ JSON.toJSONString(user));
// 查询当前登录的用户的系统角色 // 查询当前登录的用户的系统角色
List<UserRole> userRoles = userRoleMapper.selectUserRoleList(UserRole.builder().userId(user.getUserid()).build()); Set<String> userRoles = user.getRoles();//userRoleMapper.selectUserRoleList(UserRole.builder().userId(user.getUserid()).build());
if(!StringUtils.isEmpty(userRoles)&&userRoles.size()>0){ if(!StringUtils.isEmpty(userRoles)&&userRoles.size()>0){
List<String> roleCodes = userRoles.stream().map(UserRole::getRoleCode).collect(Collectors.toList()); if(userRoles.contains("admin")){
if(roleCodes.contains("admin")){
//查询所有 //查询所有
buildingInfo.setCreatedId(null); buildingInfo.setCreatedId(null);
}else { }else {

37
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
View File

@@ -77,7 +77,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY distance LIMIT 20 ORDER BY distance LIMIT 20
</select> </select>
<select id="getBuildingByCity" resultType="com.ruoyi.system.domain.WxBuildingInfo"> <select id="getBuildingByCity" resultType="com.ruoyi.system.domain.WxBuildingInfo">
select info.* from building_info info where info.is_deleted=0
<if test="status != null and status != ''">
AND info.status=#{status}
</if>
<if test="buildingName != null and buildingName != ''">
AND info.building_name like CONCAT('%',#{buildingName},'%')
</if>
<if test="cityCode != null and cityCode != ''">
AND info.city_code=#{cityCode}
</if>
<if test="isSupportlive != null and isSupportlive != ''">
AND info.is_supportlive=#{isSupportlive}
</if>
<if test="createdId != null">
AND created_id=#{createdId}
</if>
</select> </select>
<select id="getAllBuildingByCondition" resultType="com.ruoyi.system.domain.vo.BuildingInfoResponse"> <select id="getAllBuildingByCondition" resultType="com.ruoyi.system.domain.vo.BuildingInfoResponse">
@@ -98,19 +113,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND created_id=#{createdId} AND created_id=#{createdId}
</if> </if>
</select> </select>
<select id="getAuditPage" parameterType="WxBuildingInfo" resultMap="WxBuildingInfoResult"> <select id="getAuditPage" resultType="com.ruoyi.system.domain.WxBuildingInfo">
SELECT * FROM building_info where 1=1 select info.* from building_info info where info.is_deleted=0
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND status=#{status} AND info.status=#{status}
</if> </if>
<if test="buildingName != null and buildingName != ''"> <if test="buildingName != null and buildingName != ''">
AND building_name like CONCAT('%',#{buildingName},'%') AND info.building_name like CONCAT('%',#{buildingName},'%')
</if> </if>
<if test="createdBy != null and createdBy != ''"> <if test="cityCode != null and cityCode != ''">
AND created_by=#{createdBy} AND info.city_code=#{cityCode}
</if>
<if test="isSupportlive != null and isSupportlive != ''">
AND info.is_supportlive=#{isSupportlive}
</if> </if>
<if test="createdId != null"> <if test="createdId != null">
AND created_id=#{createdId} AND info.created_id=#{createdId}
</if>
<if test="createdBy != null and createdBy != ''">
AND info.created_by=#{createdBy}
</if> </if>
</select> </select>