From 55c8cbd33ea20e9889c2d68fc61c161b96613b89 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Thu, 20 Jul 2023 15:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WxBuildingInfoServiceImpl.java       |  8 ++--
 .../mapper/system/WxBuildingInfoMapper.xml    | 37 +++++++++++++++----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
index c09b5a22..273788ae 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSON;
@@ -161,12 +162,11 @@ public class WxBuildingInfoServiceImpl implements IWxBuildingInfoService
     @Override
     public List<WxBuildingInfo> getAuditPage(WxBuildingInfo buildingInfo) {
         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){
-            List<String> roleCodes = userRoles.stream().map(UserRole::getRoleCode).collect(Collectors.toList());
-            if(roleCodes.contains("admin")){
+            if(userRoles.contains("admin")){
                 //查询所有
                 buildingInfo.setCreatedId(null);
             }else {
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
index 67684ad9..10700320 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
@@ -77,7 +77,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY distance LIMIT 20
     </select>
     <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 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}
         </if>
     </select>
-    <select id="getAuditPage" parameterType="WxBuildingInfo" resultMap="WxBuildingInfoResult">
-        SELECT * FROM building_info where 1=1
+    <select id="getAuditPage" resultType="com.ruoyi.system.domain.WxBuildingInfo">
+        select info.* from building_info info where info.is_deleted=0
         <if test="status != null and status != ''">
-            AND  status=#{status}
+            AND  info.status=#{status}
         </if>
         <if test="buildingName != null and buildingName != ''">
-            AND  building_name like  CONCAT('%',#{buildingName},'%')
+            AND  info.building_name like  CONCAT('%',#{buildingName},'%')
         </if>
-        <if test="createdBy != null and createdBy != ''">
-            AND  created_by=#{createdBy}
+        <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}
+            AND  info.created_id=#{createdId}
+        </if>
+        <if test="createdBy != null and createdBy != ''">
+            AND  info.created_by=#{createdBy}
         </if>
     </select>