修改油站信息

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -1,7 +1,10 @@
 package com.yijia.station.controller;
 
+import java.util.Arrays;
 import java.util.List;
 
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,11 +46,12 @@ public class PayOrderController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(PayOrder payOrder)
     {
-       /* LoginUser currentUser = SecurityUtils.getLoginUser();
-        boolean flag= sysUserService.getUserRole(currentUser);
-        if(!flag){
-            payOrder.setStationId(currentUser.getUser().getDeptId());
-        }*/
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         startPage();
         payOrder.setStatus("1");
         List<PayOrder> list = payOrderService.selectPayOrderList(payOrder);
@@ -60,6 +64,12 @@ public class PayOrderController extends BaseController
     @GetMapping("/listInfo")
     public TableDataInfo listInfo(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         List<PayOrder> list = payOrderService.selectPayOrderList(payOrder);
         return getTable(list);
     }
@@ -73,8 +83,14 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectDaySources")
     public AjaxResult selectDaySources(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+//        payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         PayOrder order = payOrderService.selectDaySources(payOrder);
         return AjaxResult.success(order);
@@ -89,8 +105,14 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectOilTypeSources")
     public TableDataInfo selectOilTypeSources(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+//        payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         List<PayOrder> orderList = payOrderService.selectOilTypeSources(payOrder);
         return getTable(orderList);
@@ -105,8 +127,14 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectOverViewData")
     public AjaxResult selectOverViewData(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+//        payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         PayOrder order = payOrderService.selectOverViewData(payOrder);
         return AjaxResult.success(order);
@@ -119,9 +147,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectDayReportDetail")
     public TableDataInfo selectDayReportDetail(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         //默认当前登陆人的ID 5冯总油站
         startPage();
-        payOrder.setStationId(Long.valueOf("5"));
+//        payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.selectDayReport(payOrder);
         return getDataTable(orderList);
@@ -136,8 +170,14 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectDayReport")
     public TableDataInfo selectDayReport(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+      //  payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
        List<PayOrder>  orderList = payOrderService.selectDayReport(payOrder);
         return getTable(orderList);
@@ -151,6 +191,12 @@ public class PayOrderController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         List<PayOrder> list = payOrderService.selectPayOrderExport(payOrder);
         ExcelUtil<PayOrder> util = new ExcelUtil<PayOrder>(PayOrder.class);
 
@@ -177,13 +223,14 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata92")
     public TableDataInfo listQydata92(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         payOrder.setOilName("92#");
-        //获取当前登陆所属stationId
-       // LoginUser currentUser = SecurityUtils.getLoginUser();
-        // 获取当前的用户名称
-       // String userName = currentUser.getUsername();
-        //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+       // payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
@@ -197,9 +244,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata95")
     public TableDataInfo listQydata95(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         payOrder.setOilName("95#");
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+      //  payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
@@ -213,9 +266,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata97")
     public TableDataInfo listQydata97(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         payOrder.setOilName("97#");
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+        //payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
@@ -230,9 +289,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata20")
     public TableDataInfo listQydata20(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         payOrder.setOilName("-20#");
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+//        payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
@@ -246,9 +311,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata0")
     public TableDataInfo listQydata0(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         payOrder.setOilName("0#");
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+//        payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
@@ -262,6 +333,12 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata10")
     public TableDataInfo listQydata10(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         payOrder.setOilName("-10#");
         //默认当前登陆人的ID 5冯总油站
         payOrder.setStationId(Long.valueOf("5"));
@@ -278,8 +355,14 @@ public class PayOrderController extends BaseController
     @GetMapping("/listXdata")
     public TableDataInfo listXdata(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            payOrder.setStationIdList(list);
+        }
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+//        payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listXdata(payOrder);
         return getTable(orderList);
@@ -291,8 +374,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/getPayOrderInfoMin")
     public AjaxResult getPayOrderInfoMin(PayOrder payOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        payOrder.setStationId(currentUser.getUser().getDeptId());
+//        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+//        if(selectDeptid !=null && selectDeptid!=""){
+//            List<String> list = Arrays.asList(selectDeptid.split(","));
+//            payOrder.setStationIdList(list);
+//        }
         //默认当前登陆人的ID 5冯总油站
-        payOrder.setStationId(Long.valueOf("5"));
+//        payOrder.setStationId(Long.valueOf("5"));
         payOrder.setStatus("1");
         return  AjaxResult.success(payOrderService.getPayOrderInfoMin(payOrder));
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -7,6 +7,9 @@ import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.exception.CustomException;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.station.domain.PayOrder;
 import com.yijia.station.domain.StationClassesSummary;
 import com.yijia.station.domain.StationDeviceManage;
@@ -15,6 +18,7 @@ import com.yijia.station.service.IPayOrderService;
 import com.yijia.station.service.IStationClassesSummaryService;
 import com.yijia.station.service.IStationDeviceManageService;
 import com.yijia.station.utils.FeiEPrinterUtil;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,7 +56,8 @@ public class StationClassStructureController extends BaseController
     private IStationClassesSummaryService stationClassesSummaryService;
     @Autowired
     private IStationDeviceManageService stationDeviceManageService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询班结管理列表
      */
@@ -60,6 +65,11 @@ public class StationClassStructureController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationClassStructure stationClassStructure)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        boolean flag= sysUserService.getUserRole(currentUser);
+        if(!flag){
+            stationClassStructure.setStationId(currentUser.getUser().getDeptId());
+        }
         startPage();
         List<StationClassStructure> list = stationClassStructureService.selectStationClassStructureList(stationClassStructure);
         return getDataTable(list);
@@ -69,6 +79,7 @@ public class StationClassStructureController extends BaseController
     @GetMapping("/listPersonnelStructure")
     public TableDataInfo listPersonnelStructure(StationClassStructure stationClassStructure)
     {
+
         List<StationClassStructure> list = new ArrayList<>();
         if(stationClassStructure!=null &&stationClassStructure.getStationId()!=null ){
           list = stationClassStructureService.listPersonnelStructure(stationClassStructure);
@@ -100,7 +111,6 @@ public class StationClassStructureController extends BaseController
     @GetMapping("/listClass")
     public AjaxResult listClass(StationClassStructure stationClassStructure)
     {
-
         return AjaxResult.success(stationClassStructureService.listClass(stationClassStructure));
     }
     /**
@@ -135,8 +145,8 @@ public class StationClassStructureController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody StationClassStructure stationClassStructure) throws ParseException {
         //获取当前班结油站
-        // Long stationId=stationClassStructure.getStationId();
-        Long stationId= Long.valueOf("5");
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        Long stationId=currentUser.getUser().getDeptId();
         String stationName=stationClassStructure.getStationName();
         String username = stationClassStructure.getClassStructureMan();
         //根据油站查询出油站是否班结过，班结过就需要查询上次班结的时间
@@ -280,7 +290,7 @@ public class StationClassStructureController extends BaseController
         }else{
             //初次班结 班结时间默认为当前时间，班结人username
             PayOrder p =new  PayOrder();
-            p.setStationId(Long.valueOf("5"));
+            p.setStationId(stationId);
             p.setStatus("1");
             PayOrder orders= payOrderService.getPayOrderInfoMin(p);
             if(orders!=null){
@@ -291,109 +301,112 @@ public class StationClassStructureController extends BaseController
                 order.setStatus("1");
                 order.setEndTime(dateFormat.format(date));
                 List<PayOrder> list = payOrderService.selectPayOrderList(order);
-                for(PayOrder payOrder:list){
-                    StationClassStructure stationclass =new StationClassStructure();
-                    stationclass.setStationId(payOrder.getStationId());
-                    stationclass.setClassStartDate(dfe.parse(beginTime));
-                    stationclass.setStationName(payOrder.getStationName());
-                    stationclass.setClassStructureMan(username);
-                    stationclass.setClassStructureDate(date);
-                    stationclass.setClassStructureNo(no);
-                    stationclass.setOrderNo(payOrder.getOrderNo());
-                    stationclass.setOilGun(payOrder.getOilGun());
-                    stationclass.setOilName(payOrder.getOilName());
-                    if(payOrder.getOilPirce()!=null){
-                        stationclass.setOilPirce(payOrder.getOilPirce());
-                    }
-                    if(payOrder.getOilType()!=null){
-                        stationclass.setOilType(payOrder.getOilType());
-                    }
-                    stationclass.setConsumerId(payOrder.getConsumerId());
-                    stationclass.setConsumer(payOrder.getConsumer());
-                    stationclass.setAmt(payOrder.getAmt());
-                    if(payOrder.getReceivableAmt()!=null){
-                        stationclass.setReceivableAmt(payOrder.getReceivableAmt());
-                    }else{
-                        stationclass.setReceivableAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getReceivedAmt()!=null){
-                        stationclass.setReceivedAmt(payOrder.getReceivedAmt());
-                    }else{
-                        stationclass.setReceivedAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getDiscountAmt()!=null){
-                        stationclass.setDiscountAmt(payOrder.getDiscountAmt());
-                    }else{
-                        stationclass.setDiscountAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getDiscountCouponAmt()!=null){
-                        stationclass.setDiscountCouponAmt(payOrder.getDiscountCouponAmt());
-                    }else{
-                        stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getWxAmt()!=null){
-                        stationclass.setWxAmt(payOrder.getWxAmt());
-                    }else{
-                        stationclass.setWxAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getZfbAmt()!=null){
-                        stationclass.setZfbAmt(payOrder.getZfbAmt());
-                    }else{
-                        stationclass.setZfbAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getPosAmt()!=null){
-                        stationclass.setPosAmt(payOrder.getPosAmt());
-                    }else{
-                        stationclass.setPosAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getXjAmt()!=null){
-                        stationclass.setXjAmt(payOrder.getXjAmt());
-                    }else{
-                        stationclass.setXjAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getDidiAppAmt()!=null){
-                        stationclass.setDidiAppAmt(payOrder.getDidiAppAmt());
-                    }else{
-                        stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getTyAppAmt()!=null){
-                        stationclass.setDidiAppAmt(payOrder.getTyAppAmt());
-                    }else{
-                        stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                if(list !=null && list.size()>0){
+                    for(PayOrder payOrder:list){
+                        StationClassStructure stationclass =new StationClassStructure();
+                        stationclass.setStationId(payOrder.getStationId());
+                        stationclass.setClassStartDate(dfe.parse(beginTime));
+                        stationclass.setStationName(payOrder.getStationName());
+                        stationclass.setClassStructureMan(username);
+                        stationclass.setClassStructureDate(date);
+                        stationclass.setClassStructureNo(no);
+                        stationclass.setOrderNo(payOrder.getOrderNo());
+                        stationclass.setOilGun(payOrder.getOilGun());
+                        stationclass.setOilName(payOrder.getOilName());
+                        if(payOrder.getOilPirce()!=null){
+                            stationclass.setOilPirce(payOrder.getOilPirce());
+                        }
+                        if(payOrder.getOilType()!=null){
+                            stationclass.setOilType(payOrder.getOilType());
+                        }
+                        stationclass.setConsumerId(payOrder.getConsumerId());
+                        stationclass.setConsumer(payOrder.getConsumer());
+                        stationclass.setAmt(payOrder.getAmt());
+                        if(payOrder.getReceivableAmt()!=null){
+                            stationclass.setReceivableAmt(payOrder.getReceivableAmt());
+                        }else{
+                            stationclass.setReceivableAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getReceivedAmt()!=null){
+                            stationclass.setReceivedAmt(payOrder.getReceivedAmt());
+                        }else{
+                            stationclass.setReceivedAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getDiscountAmt()!=null){
+                            stationclass.setDiscountAmt(payOrder.getDiscountAmt());
+                        }else{
+                            stationclass.setDiscountAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getDiscountCouponAmt()!=null){
+                            stationclass.setDiscountCouponAmt(payOrder.getDiscountCouponAmt());
+                        }else{
+                            stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getWxAmt()!=null){
+                            stationclass.setWxAmt(payOrder.getWxAmt());
+                        }else{
+                            stationclass.setWxAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getZfbAmt()!=null){
+                            stationclass.setZfbAmt(payOrder.getZfbAmt());
+                        }else{
+                            stationclass.setZfbAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getPosAmt()!=null){
+                            stationclass.setPosAmt(payOrder.getPosAmt());
+                        }else{
+                            stationclass.setPosAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getXjAmt()!=null){
+                            stationclass.setXjAmt(payOrder.getXjAmt());
+                        }else{
+                            stationclass.setXjAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getDidiAppAmt()!=null){
+                            stationclass.setDidiAppAmt(payOrder.getDidiAppAmt());
+                        }else{
+                            stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getTyAppAmt()!=null){
+                            stationclass.setDidiAppAmt(payOrder.getTyAppAmt());
+                        }else{
+                            stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getOtherAmt()!=null){
+                            stationclass.setOtherAmt(payOrder.getOtherAmt());
+                        }else{
+                            stationclass.setOtherAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getDzkAmt()!=null){
+                            stationclass.setDzkAmt(payOrder.getDzkAmt());
+                        }else{
+                            stationclass.setDzkAmt(BigDecimal.valueOf(0));
+                        }
+                        if(payOrder.getMemberAmt()!=null){
+                            stationclass.setMemberAmt(payOrder.getMemberAmt());
+                        }else{
+                            stationclass.setMemberAmt(BigDecimal.valueOf(0));
+                        }
+                        stationclass.setOrderLiters(payOrder.getOrderLiters());
+                        stationclass.setPayWay(payOrder.getPayWay());
+                        stationclass.setPayType(payOrder.getPayType());
+                        stationclass.setPayDate(payOrder.getPayDate());
+                        stationclass.setOilPersonnel(payOrder.getOilPersonnel());
+                        stationclass.setOrderType(payOrder.getOrderType());
+                        if(payOrder.getPrintCount()!=null){
+                            stationclass.setPrintNum(payOrder.getPrintCount());
+                        }else{
+                            stationclass.setPrintNum(Long.valueOf("0"));
+                        }
+                        i= stationClassStructureService.insertStationClassStructure(stationclass);
                     }
-                    if(payOrder.getOtherAmt()!=null){
-                        stationclass.setOtherAmt(payOrder.getOtherAmt());
-                    }else{
-                        stationclass.setOtherAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getDzkAmt()!=null){
-                        stationclass.setDzkAmt(payOrder.getDzkAmt());
-                    }else{
-                        stationclass.setDzkAmt(BigDecimal.valueOf(0));
-                    }
-                    if(payOrder.getMemberAmt()!=null){
-                        stationclass.setMemberAmt(payOrder.getMemberAmt());
-                    }else{
-                        stationclass.setMemberAmt(BigDecimal.valueOf(0));
-                    }
-                    stationclass.setOrderLiters(payOrder.getOrderLiters());
-                    stationclass.setPayWay(payOrder.getPayWay());
-                    stationclass.setPayType(payOrder.getPayType());
-                    stationclass.setPayDate(payOrder.getPayDate());
-                    stationclass.setOilPersonnel(payOrder.getOilPersonnel());
-                    stationclass.setOrderType(payOrder.getOrderType());
-                    if(payOrder.getPrintCount()!=null){
-                        stationclass.setPrintNum(payOrder.getPrintCount());
-                    }else{
-                        stationclass.setPrintNum(Long.valueOf("0"));
-                    }
-                    i= stationClassStructureService.insertStationClassStructure(stationclass);
                 }
-            }
 
+            }
         }
         StationClassStructure scs =new StationClassStructure();
         scs.setClassStructureNo(no);
+        scs.setStationId(stationId);
         //汇总班结数据将汇总的数据插入到汇总数据中
         StationClassStructure stationclass = stationClassStructureService.selectSummyClassStructure(scs);
         if(stationclass!=null){
@@ -427,7 +440,6 @@ public class StationClassStructureController extends BaseController
             if(stationclass.getDiscountAmt()!=null){
                 stationClassesSummary.setDiscountAmt(stationclass.getDiscountAmt());
             }
-
             if(stationclass.getDzkAmt()!=null){
                 stationClassesSummary.setDzkAmt(stationclass.getDzkAmt());
             }else{
@@ -438,7 +450,6 @@ public class StationClassStructureController extends BaseController
             }else{
                 stationClassesSummary.setZfbAmt(BigDecimal.valueOf(0));
             }
-
             if(stationclass.getWxAmt()!=null){
                 stationClassesSummary.setWxAmt(stationclass.getWxAmt());
             }else{
@@ -449,15 +460,13 @@ public class StationClassStructureController extends BaseController
             }else{
                 stationClassesSummary.setPrintNum(Long.valueOf("0"));
             }
-
             stationClassesSummary.setClassesMan(stationclass.getClassStructureMan());
             i=stationClassesSummaryService.insertStationClassesSummary(stationClassesSummary);
-        }
-        if(i==1){
             //班结成功，打印小票
             //查询班结小票数据
             StationClassStructure classStructure= new StationClassStructure();
             classStructure.setClassStructureNo(no);
+            classStructure.setStationId(stationId);
             List<StationClassStructure>  list= stationClassStructureService.listOilStructure(classStructure);
             //支付方式汇总数据
             List<StationClassStructure>  paylist= stationClassStructureService.listPayStructure(classStructure);
@@ -548,11 +557,11 @@ public class StationClassStructureController extends BaseController
                 //按支付方式
                 content += "支付方式  笔    升数      金额<BR>";
                 for(StationClassStructure sc : paylist){
-                   String orderno= sc.getOrderNo();
+                    String orderno= sc.getOrderNo();
                     orderno =addSpace(orderno,3);
                     String orderLiter="";
                     if(sc.getOrderLiters()!=null){
-                         orderLiter = sc.getOrderLiters().toString();
+                        orderLiter = sc.getOrderLiters().toString();
                     }else{
                         sc.setOrderLiters(BigDecimal.valueOf(0));
                         orderLiter= sc.getOrderLiters().toString();
@@ -573,39 +582,24 @@ public class StationClassStructureController extends BaseController
                 content += "实际支付： "+sumAmt+" 元<BR>";
                 content += "到款金额： "+dzAmt+"元<BR>";
                 content += "班结人： "+list.get(0).getClassStructureMan()+"<BR>";
-            }else{
-                content += "开始时间： <BR>";
-                content += "班结时间： <BR>";
-                content += "油站   笔   升数   金额 <BR>";
+                content += "<BR>";
                 content += "--------------------------------<BR>";
-                content += "合计  <BR>";
-                content += " <BR>";
-                content += "支付方式  笔  升数  金额<BR>";
-                content += "小票张数：<BR>";
-                content += "班结金额：<BR>";
-                content += "优惠总额：<BR>";
-                content += "实际支付： <BR>";
-                content += "到款金额： <BR>";
-                content += "班结人：<BR>";
-            }
-            content += "<BR>";
-            content += "--------------------------------<BR>";
-            content += "<BR>";
-            //查询打印机信息
-            Map params  =new HashMap();
-            params.put("stationId", list.get(0).getStationId());
-            params.put("deviceType", "3");
-            Map mp  = stationDeviceManageService.getPrinterSnByStationId(params);
-            System.out.println(mp);
-            if(mp.containsKey("device_no") && mp.get("device_no")!= null && mp.get("device_no")!=""){
-               String sn = mp.get("device_no").toString();
-               FeiEPrinterUtil.printReceipt(sn, content);
-            }else {
-                logger.info("请正确配置打印机");
+                content += "<BR>";
+                //查询打印机信息
+                Map params  =new HashMap();
+                params.put("stationId", list.get(0).getStationId());
+                params.put("deviceType", "3");
+                Map mp  = stationDeviceManageService.getPrinterSnByStationId(params);
+                if(mp!=null&&mp.containsKey("device_no") && mp.get("device_no")!= null && mp.get("device_no")!=""){
+                    String sn = mp.get("device_no").toString();
+                    FeiEPrinterUtil.printReceipt(sn, content);
+                }else {
+                    logger.info("请正确配置打印机");
+                    i=2;
+                }
             }
         }
-        return toAjax(i);
-
+        return toAjaxee(i);
     }
     private  String addSpace(String str, int size) {
         int len = str.length();
@@ -617,6 +611,7 @@ public class StationClassStructureController extends BaseController
         return str;
     }
 
+
     /**
      * 修改班结管理
      */
@@ -646,7 +641,9 @@ public class StationClassStructureController extends BaseController
     @GetMapping("/getAgeClassStructure")
     public AjaxResult getAgeClassStructure(StationClassStructure stationClassStructure)
     {
-        stationClassStructure.setStationId(Long.valueOf("5"));
+        //根据当前登陆人获取当前油站id
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationClassStructure.setStationId(currentUser.getUser().getDeptId());
         return AjaxResult.success(stationClassStructureService.selectStationClassStructureMax(stationClassStructure));
     }
     //初始化数据 根据员工汇总
@@ -654,10 +651,11 @@ public class StationClassStructureController extends BaseController
     @GetMapping("/selectPersonnelStructure")
     public TableDataInfo selectPersonnelStructure(StationClassStructure stationClassStructure)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        List<StationClassStructure> list = new ArrayList<>();
         //根据油站查询出上次班结时间，
-        stationClassStructure.setStationId(Long.valueOf("5"));
+        stationClassStructure.setStationId(currentUser.getUser().getDeptId());
         StationClassStructure  structure=  stationClassStructureService.selectStationClassStructureMax(stationClassStructure);
-        List<StationClassStructure> list = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if(structure!=null){
             PayOrder payOrder =new PayOrder();
@@ -679,7 +677,7 @@ public class StationClassStructureController extends BaseController
             PayOrder payOrder =new PayOrder();
             payOrder.setStatus("1");
             payOrder.setStationId(stationClassStructure.getStationId());
-            List<PayOrder> payOrderList =  payOrderService.selectPersonnelStructure(payOrder);
+            List<PayOrder> payOrderList=  payOrderService.selectPersonnelStructure(payOrder);
             for(PayOrder order:payOrderList){
                 StationClassStructure classStructure =new StationClassStructure();
                 classStructure.setOilPersonnel(order.getOilPersonnel());
@@ -690,6 +688,7 @@ public class StationClassStructureController extends BaseController
                 list.add(classStructure);
             }
         }
+
         return getTable(list);
     }
 
@@ -702,8 +701,9 @@ public class StationClassStructureController extends BaseController
     @GetMapping("/selectOilStructure")
     public TableDataInfo selectOilStructure(StationClassStructure stationClassStructure)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
         //根据油站查询出上次班结时间，
-        stationClassStructure.setStationId(Long.valueOf("5"));
+        stationClassStructure.setStationId(currentUser.getUser().getDeptId());
         StationClassStructure  structure=  stationClassStructureService.selectStationClassStructureMax(stationClassStructure);
         List<StationClassStructure> list = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -752,7 +752,8 @@ public class StationClassStructureController extends BaseController
     public TableDataInfo selectPersonnelPayStructure(StationClassStructure stationClassStructure)
     {
         //根据油站查询出上次班结时间，
-        stationClassStructure.setStationId(Long.valueOf("5"));
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationClassStructure.setStationId(currentUser.getUser().getDeptId());
         StationClassStructure  structure=  stationClassStructureService.selectStationClassStructureMax(stationClassStructure);
         List<StationClassStructure> list = new ArrayList<>();
         //根据上次班结时间，和油站去订单表中查询数据，并按照人员汇总数据

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationClassesSummaryController.java

@@ -1,6 +1,11 @@
 package com.yijia.station.controller;
 
+import java.util.Arrays;
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +37,8 @@ public class StationClassesSummaryController extends BaseController
 {
     @Autowired
     private IStationClassesSummaryService stationClassesSummaryService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询【请填写功能名称】列表
      */
@@ -40,8 +46,14 @@ public class StationClassesSummaryController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationClassesSummary stationClassesSummary)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationClassesSummary.setStationIdList(list);
+        }
         startPage();
-        stationClassesSummary.setStationId(Long.valueOf("5"));
+//        stationClassesSummary.setStationId(Long.valueOf("5"));
         List<StationClassesSummary> list = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummary);
         return getDataTable(list);
     }
@@ -54,6 +66,12 @@ public class StationClassesSummaryController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationClassesSummary stationClassesSummary)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationClassesSummary.setStationIdList(list);
+        }
         List<StationClassesSummary> list = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummary);
         ExcelUtil<StationClassesSummary> util = new ExcelUtil<StationClassesSummary>(StationClassesSummary.class);
         return util.exportExcel(list, "summary");

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationDeviceManageController.java

@@ -1,9 +1,12 @@
 package com.yijia.station.controller;
 
+import java.util.Arrays;
 import java.util.List;
 
 import com.yijia.common.core.domain.entity.SysUser;
+import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,7 +38,8 @@ public class StationDeviceManageController extends BaseController
 {
     @Autowired
     private IStationDeviceManageService stationDeviceManageService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询油站设备管理列表
      */
@@ -43,6 +47,12 @@ public class StationDeviceManageController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationDeviceManage stationDeviceManage)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationDeviceManage.setStationIdList(list);
+        }
         startPage();
         List<StationDeviceManage> list = stationDeviceManageService.selectStationDeviceManageList(stationDeviceManage);
         return getDataTable(list);
@@ -56,6 +66,12 @@ public class StationDeviceManageController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationDeviceManage stationDeviceManage)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationDeviceManage.setStationIdList(list);
+        }
         List<StationDeviceManage> list = stationDeviceManageService.selectStationDeviceManageList(stationDeviceManage);
         ExcelUtil<StationDeviceManage> util = new ExcelUtil<StationDeviceManage>(StationDeviceManage.class);
         return util.exportExcel(list, "manage");

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationInfoController.java

@@ -1,6 +1,11 @@
 package com.yijia.station.controller;
 
+import java.util.Arrays;
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +37,8 @@ public class StationInfoController extends BaseController
 {
     @Autowired
     private IStationInfoService stationInfoService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询油站信息列表
      */
@@ -40,6 +46,12 @@ public class StationInfoController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationInfo stationInfo)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationInfo.setStationIdList(list);
+        }
         startPage();
         List<StationInfo> list = stationInfoService.selectStationInfoList(stationInfo);
         return getDataTable(list);
@@ -49,6 +61,12 @@ public class StationInfoController extends BaseController
     @GetMapping("/selectStationInfo")
     public TableDataInfo selectStationInfo(StationInfo stationInfo)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationInfo.setStationIdList(list);
+        }
         List<StationInfo> list = stationInfoService.selectStationInfoList(stationInfo);
         return getDataTable(list);
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationOilGunController.java

@@ -2,6 +2,7 @@ package com.yijia.station.controller;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -52,9 +53,10 @@ public class StationOilGunController extends BaseController
     public TableDataInfo list(StationOilGun stationOilGun)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        boolean flag= sysUserService.getUserRole(currentUser);
-        if(!flag){
-            stationOilGun.setStationId(currentUser.getUser().getDeptId());
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationOilGun.setStationIdList(list);
         }
         startPage();
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
@@ -70,9 +72,10 @@ public class StationOilGunController extends BaseController
     public AjaxResult export(StationOilGun stationOilGun)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        boolean flag= sysUserService.getUserRole(currentUser);
-        if(!flag){
-            stationOilGun.setStationId(currentUser.getUser().getDeptId());
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationOilGun.setStationIdList(list);
         }
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
         ExcelUtil<StationOilGun> util = new ExcelUtil<StationOilGun>(StationOilGun.class);
@@ -87,9 +90,10 @@ public class StationOilGunController extends BaseController
     public TableDataInfo selectGun(StationOilGun stationOilGun)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        boolean flag= sysUserService.getUserRole(currentUser);
-        if(!flag){
-            stationOilGun.setStationId(currentUser.getUser().getDeptId());
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationOilGun.setStationIdList(list);
         }
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
         return getTable(list);

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationOilPriceAdjustController.java

@@ -2,6 +2,7 @@ package com.yijia.station.controller;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -12,6 +13,7 @@ import com.yijia.station.domain.StationOilGun;
 import com.yijia.station.domain.StationOilPrice;
 import com.yijia.station.service.IStationOilGunService;
 import com.yijia.station.service.IStationOilPriceService;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,6 +49,8 @@ public class StationOilPriceAdjustController extends BaseController
     private IStationOilPriceService stationOilPriceService;
     @Autowired
     private IStationOilGunService stationOilGunService;
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询油品调价信息列表
      */
@@ -54,6 +58,12 @@ public class StationOilPriceAdjustController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationOilPriceAdjust stationOilPriceAdjust)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationOilPriceAdjust.setStationIdList(list);
+        }
         startPage();
         List<StationOilPriceAdjust> list = stationOilPriceAdjustService.selectStationOilPriceAdjustList(stationOilPriceAdjust);
         return getDataTable(list);

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationOilPriceController.java

@@ -2,10 +2,14 @@ package com.yijia.station.controller;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.station.domain.StationOilPriceAdjust;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,7 +41,8 @@ public class StationOilPriceController extends BaseController
 {
     @Autowired
     private IStationOilPriceService stationOilPriceService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询油品价格列表
      */
@@ -45,6 +50,12 @@ public class StationOilPriceController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationOilPrice stationOilPrice)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationOilPrice.setStationIdList(list);
+        }
         startPage();
         List<StationOilPrice> list = stationOilPriceService.selectStationOilPriceList(stationOilPrice);
         return getDataTable(list);
@@ -58,6 +69,11 @@ public class StationOilPriceController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationOilPrice stationOilPrice)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        boolean flag= sysUserService.getUserRole(currentUser);
+        if(!flag){
+            stationOilPrice.setStationId(currentUser.getUser().getDeptId());
+        }
         List<StationOilPrice> list = stationOilPriceService.selectStationOilPriceList(stationOilPrice);
         ExcelUtil<StationOilPrice> util = new ExcelUtil<StationOilPrice>(StationOilPrice.class);
         return util.exportExcel(list, "price");

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationPayController.java

@@ -1,6 +1,11 @@
 package com.yijia.station.controller;
 
+import java.util.Arrays;
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +37,8 @@ public class StationPayController extends BaseController
 {
     @Autowired
     private IStationPayService stationPayService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询油站支付设置列表
      */
@@ -40,6 +46,12 @@ public class StationPayController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationPay stationPay)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationPay.setStationIdList(list);
+        }
         startPage();
         List<StationPay> list = stationPayService.selectStationPayList(stationPay);
         return getDataTable(list);
@@ -53,6 +65,11 @@ public class StationPayController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationPay stationPay)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        boolean flag= sysUserService.getUserRole(currentUser);
+        if(!flag){
+            stationPay.setStationId(currentUser.getUser().getDeptId());
+        }
         List<StationPay> list = stationPayService.selectStationPayList(stationPay);
         ExcelUtil<StationPay> util = new ExcelUtil<StationPay>(StationPay.class);
         return util.exportExcel(list, "pay");

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationPersonnelController.java

@@ -1,6 +1,11 @@
 package com.yijia.station.controller;
 
+import java.util.Arrays;
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +37,8 @@ public class StationPersonnelController extends BaseController
 {
     @Autowired
     private IStationPersonnelService stationPersonnelService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询油站员工信息列表
      */
@@ -40,6 +46,12 @@ public class StationPersonnelController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationPersonnel stationPersonnel)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationPersonnel.setStationIdList(list);
+        }
         startPage();
         List<StationPersonnel> list = stationPersonnelService.selectStationPersonnelList(stationPersonnel);
         return getDataTable(list);
@@ -53,6 +65,12 @@ public class StationPersonnelController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationPersonnel stationPersonnel)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+        if(selectDeptid !=null && selectDeptid!=""){
+            List<String> list = Arrays.asList(selectDeptid.split(","));
+            stationPersonnel.setStationIdList(list);
+        }
         List<StationPersonnel> list = stationPersonnelService.selectStationPersonnelList(stationPersonnel);
         ExcelUtil<StationPersonnel> util = new ExcelUtil<StationPersonnel>(StationPersonnel.class);
         return util.exportExcel(list, "personnel");

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java

@@ -2,6 +2,8 @@ package com.yijia.station.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -165,6 +167,16 @@ public class PayOrder extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date likePayDate;
 
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
     /**
      * 展示信息别名
      * @return

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationClassesSummary.java

@@ -2,6 +2,8 @@ package com.yijia.station.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -83,7 +85,17 @@ public class StationClassesSummary extends BaseEntity
     @Excel(name = "班结人")
     private String classesMan;
 
-    public void setId(Long id) 
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationDeviceManage.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.yijia.common.annotation.Excel;
 import com.yijia.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 油站设备管理对象 station_device_manage
  * 
@@ -53,8 +55,20 @@ public class StationDeviceManage extends BaseEntity
     /** 设备厂家 */
     @Excel(name = "设备厂家")
     private String deviceFactory;
+    /**
+     * 根据用户所属组织，平台，集团，油站查询条件
+     */
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
 
-    public void setDeviceId(Long deviceId) 
+    public void setDeviceId(Long deviceId)
     {
         this.deviceId = deviceId;
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationInfo.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.yijia.common.annotation.Excel;
 import com.yijia.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 油站信息对象 station_info
  * 
@@ -62,7 +64,28 @@ public class StationInfo extends BaseEntity
     @Excel(name = "商户编码", readConverterExp = "随=行付商户码")
     private String mno;
 
-    public void setStationId(Long stationId) 
+    /*查询用户油站id
+     */
+    private String selectStationId;
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
+    public String getSelectStationId() {
+        return selectStationId;
+    }
+
+    public void setSelectStationId(String selectStationId) {
+        this.selectStationId = selectStationId;
+    }
+
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationOilGun.java

@@ -2,6 +2,8 @@ package com.yijia.station.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -50,6 +52,19 @@ public class StationOilGun extends BaseEntity
     @Excel(name = "油枪状态", readConverterExp = "油枪状态（）")
     private String status;
 
+    /**
+     * 根据用户所属组织，平台，集团，油站查询条件
+     */
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
     public void setOilGunId(Long oilGunId) 
     {
         this.oilGunId = oilGunId;

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationOilPrice.java

@@ -2,6 +2,8 @@ package com.yijia.station.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -42,7 +44,20 @@ public class StationOilPrice extends BaseEntity
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date date;
 
-    public void setOilPriceId(Long oilPriceId) 
+    /**
+     * 根据用户所属组织，平台，集团，油站查询条件
+     */
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
+    public void setOilPriceId(Long oilPriceId)
     {
         this.oilPriceId = oilPriceId;
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationOilPriceAdjust.java

@@ -2,6 +2,8 @@ package com.yijia.station.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -63,7 +65,17 @@ public class StationOilPriceAdjust extends BaseEntity
     @Excel(name = "油价id")
     private Long oilPriceId;
 
-    public void setAdjustPriceId(Long adjustPriceId) 
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
+    public void setAdjustPriceId(Long adjustPriceId)
     {
         this.adjustPriceId = adjustPriceId;
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationPay.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.yijia.common.annotation.Excel;
 import com.yijia.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 油站支付设置对象 station_pay
  * 
@@ -70,7 +72,17 @@ public class StationPay extends BaseEntity
     @Excel(name = "优惠方案设置", readConverterExp = "1=直降，2，满减，3,立=减")
     private String discountSetting;
 
-    public void setPayId(Long payId) 
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
+    public void setPayId(Long payId)
     {
         this.payId = payId;
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationPersonnel.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.yijia.common.annotation.Excel;
 import com.yijia.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 油站员工信息对象 station_personnel
  * 
@@ -42,7 +44,17 @@ public class StationPersonnel extends BaseEntity
     @Excel(name = "员工手机号")
     private String personnelPhone;
 
-    public void setPersonnelId(Long personnelId) 
+    private List<String> stationIdList;
+
+    public List<String> getStationIdList() {
+        return stationIdList;
+    }
+
+    public void setStationIdList(List<String> stationIdList) {
+        this.stationIdList = stationIdList;
+    }
+
+    public void setPersonnelId(Long personnelId)
     {
         this.personnelId = personnelId;
     }

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -106,7 +106,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
             </if>
-
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by order_id desc
     </select>
@@ -154,6 +160,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
             <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by order_id desc
     </select>
@@ -174,6 +187,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="selectOilTypeSources" parameterType="Long" resultMap="PayOrderResult">
@@ -189,6 +209,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY oil_type
     </select>
@@ -205,6 +232,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     <!--日报数据-->
@@ -215,6 +249,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY  date_format( created_date, '%Y-%m-%d' )
         ORDER BY date_format( created_date, '%Y-%m-%d' ) DESC
@@ -233,6 +274,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY oil_name ,date_format(created_date,'%Y-%m-%d')
     </select>
@@ -249,6 +297,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY date_format(created_date,'%Y-%m-%d')
     </select>
@@ -266,6 +321,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY a.oil_personnel
     </select>

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassesSummaryMapper.xml

@@ -45,6 +45,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
             <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
             <if test="classesMan != null  and classesMan != ''"> and classes_man = #{classesMan}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationDeviceManageMapper.xml

@@ -33,6 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</if>
             <if test="deviceStatus != null  and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
             <if test="deviceFactory != null  and deviceFactory != ''"> and device_factory = #{deviceFactory}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by device_id desc
     </select>

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationInfoMapper.xml

@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectStationInfoList" parameterType="StationInfo" resultMap="StationInfoResult">
         <include refid="selectStationInfoVo"/>
-        <where>  
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="stationAddress != null  and stationAddress != ''"> and station_address = #{stationAddress}</if>
             <if test="oilGunNum != null "> and oil_gun_num = #{oilGunNum}</if>
@@ -37,6 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationLongitude != null  and stationLongitude != ''"> and station_longitude = #{stationLongitude}</if>
             <if test="stationLatitude != null  and stationLatitude != ''"> and station_latitude = #{stationLatitude}</if>
             <if test="mno != null "> and mno = #{mno}</if>
+            <if test="stationIdList != null ">
+             and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+             </if>
         </where>
         order by station_id desc
     </select>

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationOilGunMapper.xml

@@ -29,6 +29,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="date != null "> and date = #{date}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationOilPriceAdjustMapper.xml

@@ -38,6 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(take_effect_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by adjust_price_id desc
     </select>

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationOilPriceMapper.xml

@@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="stationNanme != null  and stationNanme != ''"> and station_nanme = #{stationNanme}</if>
             <if test="date != null "> and date = #{date}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationPayMapper.xml

@@ -41,6 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wsPrintFlag != null  and wsPrintFlag != ''"> and ws_print_flag = #{wsPrintFlag}</if>
             <if test="printSetting != null  and printSetting != ''"> and print_setting = #{printSetting}</if>
             <if test="discountSetting != null  and discountSetting != ''"> and discount_setting = #{discountSetting}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationPersonnelMapper.xml

@@ -27,6 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
             <if test="personnelPhone != null  and personnelPhone != ''"> and personnel_phone = #{personnelPhone}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by personnel_id desc
     </select>