瀏覽代碼

停车厂增加数据过滤。

zq 3 年之前
父節點
當前提交
6f0528f6d7

+ 14 - 0
src/main/java/com/charging/chargingparking/modules/backController/ParkingInfoController.java

@@ -9,6 +9,8 @@ import com.charging.chargingparking.modules.common.dto.Sort;
 import com.charging.chargingparking.service.ParkingFeeService;
 import com.charging.chargingparking.service.ParkingFeeService;
 import com.charging.chargingparking.service.ParkingInfoService;
 import com.charging.chargingparking.service.ParkingInfoService;
 import com.charging.chargingparking.service.ParkingMerchantService;
 import com.charging.chargingparking.service.ParkingMerchantService;
+import com.charging.chargingparking.service.ParkingUserRelationService;
+import com.charging.chargingparking.sys.service.UserService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -17,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import java.util.*;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
 /**
  * @author 墨鱼_mo
  * @author 墨鱼_mo
@@ -38,6 +41,12 @@ public class ParkingInfoController {
     @Autowired
     @Autowired
     private ParkingMerchantService parkingMerchantService;
     private ParkingMerchantService parkingMerchantService;
 
 
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private ParkingUserRelationService parkingUserRelationService;
+
     @ApiOperation(value="创建空记录")
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     @GetMapping("create")
     public MessageResult<ParkingInfo> create(){
     public MessageResult<ParkingInfo> create(){
@@ -227,6 +236,11 @@ public class ParkingInfoController {
             if (StringUtils.isNotEmpty(parkingName)) {
             if (StringUtils.isNotEmpty(parkingName)) {
                 searchParams.put("parkingName","%" + parkingName + "%");
                 searchParams.put("parkingName","%" + parkingName + "%");
             }
             }
+
+            if(!userService.hasRole(subject,"SYSADMIN")) {
+                searchParams.put("filterParkingList", parkingUserRelationService.findByUserId(subject));
+            }
+
             searchParams.put("oilCarEnable", oilCarEnable);
             searchParams.put("oilCarEnable", oilCarEnable);
             searchParams.put("newEnergyCarEnable", newEnergyCarEnable);
             searchParams.put("newEnergyCarEnable", newEnergyCarEnable);
 
 

+ 10 - 1
src/main/resources/mapper/ParkingInfoMapper.xml

@@ -153,7 +153,16 @@
             <if test="searchParams.createTime != null">
             <if test="searchParams.createTime != null">
                 and create_time like #{searchParams.createTime}
                 and create_time like #{searchParams.createTime}
             </if>
             </if>
-
+            <if test="searchParams.filterParkingList!=null">
+                <if test="searchParams.filterParkingList.size>0">
+                    <foreach item="item" collection="searchParams.filterParkingList"  open=" and id in(" separator="," close=")">
+                        #{item.parkingId}
+                    </foreach>
+                </if>
+                <if test="searchParams.filterParkingList.size==0">
+                    and id=''
+                </if>
+            </if>
         </where>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}
             ${sort.name} ${sort.order}