修改所有下拉选择油站的查询

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

@@ -1,11 +1,13 @@
 package com.yijia.station.controller;
 
 import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.core.page.TableDataInfo;
 import com.yijia.common.utils.SecurityUtils;
 import com.yijia.station.domain.PayOrder;
 import com.yijia.station.service.IPayOrderService;
+import com.yijia.system.service.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,6 +25,8 @@ public class NoOilOrderController  extends BaseController {
     private IPayOrderService payOrderService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService deptService;
     /**
      * 查询订单支付列表
      */
@@ -30,11 +34,12 @@ public class NoOilOrderController  extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
-        if(selectDeptid !=null && selectDeptid!=""){
-            List<String> list = Arrays.asList(selectDeptid.split(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         startPage();
         payOrder.setStatus("1");

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

@@ -3,8 +3,10 @@ package com.yijia.station.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,9 @@ public class PayOrderController extends BaseController
     private IPayOrderService payOrderService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询订单支付列表
      */
@@ -46,11 +51,12 @@ public class PayOrderController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
-        if(selectDeptid !=null && selectDeptid!=""){
-            List<String> list = Arrays.asList(selectDeptid.split(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         startPage();
         payOrder.setStatus("1");
@@ -64,13 +70,15 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setOrderType("1");
+        payOrder.setStatus("1");
         List<PayOrder> list = payOrderService.selectPayOrderList(payOrder);
         return getTable(list);
     }
@@ -84,11 +92,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -105,11 +114,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -126,11 +136,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -145,11 +156,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         //默认当前登陆人的ID 5冯总油站
         startPage();
@@ -168,11 +180,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -188,11 +201,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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -222,11 +236,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setOilName("92#");
         payOrder.setStatus("1");
@@ -243,11 +258,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setOilName("95#");
         payOrder.setStatus("1");
@@ -264,11 +280,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setOilName("97#");
         payOrder.setStatus("1");
@@ -286,11 +303,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setOilName("-20#");
         payOrder.setStatus("1");
@@ -307,11 +325,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setOilName("0#");
         payOrder.setStatus("1");
@@ -328,11 +347,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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setOilName("-10#");
         payOrder.setStatus("1");
@@ -349,11 +369,12 @@ 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(","));
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");

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

@@ -463,7 +463,7 @@ public class StationClassStructureController extends BaseController
             StationPay  stationPay =new StationPay();
             stationPay.setStationId(stationId);
             StationPay pay = stationPayService.selectStationPayOne(stationPay);
-            if(pay!=null && pay.getWsPrintFlag().equals("1")){
+            if(pay!=null &&pay.getWsPrintFlag() !=null &&pay.getWsPrintFlag()!="" &&pay.getWsPrintFlag().equals("1")){
                 //查询班结小票数据
                 StationClassStructure classStructure= new StationClassStructure();
                 classStructure.setClassStructureNo(no);

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

@@ -1,10 +1,7 @@
 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.common.core.domain.entity.SysDept;
+import com.yijia.system.service.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +36,9 @@ public class StationClassesSummaryController extends BaseController
     private IStationClassesSummaryService stationClassesSummaryService;
     @Autowired
     private ISysUserService sysUserService;
+
+    @Autowired
+    private ISysDeptService deptService;
     /**
      * 查询【请填写功能名称】列表
      */
@@ -46,14 +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(","));
+        if(stationClassesSummary!=null &&stationClassesSummary.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationClassesSummary.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             stationClassesSummary.setStationIdList(list);
+            stationClassesSummary.setStationId(null);
         }
         startPage();
-//        stationClassesSummary.setStationId(Long.valueOf("5"));
         List<StationClassesSummary> list = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummary);
         return getDataTable(list);
     }
@@ -66,11 +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(","));
+        if(stationClassesSummary!=null &&stationClassesSummary.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationClassesSummary.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             stationClassesSummary.setStationIdList(list);
+            stationClassesSummary.setStationId(null);
         }
         List<StationClassesSummary> list = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummary);
         ExcelUtil<StationClassesSummary> util = new ExcelUtil<StationClassesSummary>(StationClassesSummary.class);

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

@@ -3,9 +3,11 @@ package com.yijia.station.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.yijia.common.core.domain.entity.SysDept;
 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.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,8 @@ public class StationDeviceManageController extends BaseController
     private IStationDeviceManageService stationDeviceManageService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService deptService;
     /**
      * 查询油站设备管理列表
      */
@@ -47,11 +51,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(","));
+        if(stationDeviceManage!=null &&stationDeviceManage.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationDeviceManage.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             stationDeviceManage.setStationIdList(list);
+            stationDeviceManage.setStationId(null);
         }
         startPage();
         List<StationDeviceManage> list = stationDeviceManageService.selectStationDeviceManageList(stationDeviceManage);
@@ -66,11 +71,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(","));
+        if(stationDeviceManage!=null &&stationDeviceManage.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationDeviceManage.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
             stationDeviceManage.setStationIdList(list);
+            stationDeviceManage.setStationId(null);
         }
         List<StationDeviceManage> list = stationDeviceManageService.selectStationDeviceManageList(stationDeviceManage);
         ExcelUtil<StationDeviceManage> util = new ExcelUtil<StationDeviceManage>(StationDeviceManage.class);

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

@@ -48,11 +48,12 @@ public class StationInfoController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysDept sysDept)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
-        if(selectDeptid !=null && selectDeptid!=""){
-            List<String> list = Arrays.asList(selectDeptid.split(","));
+        if(sysDept!=null &&sysDept.getDeptId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(sysDept.getDeptId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             sysDept.setDeptIdList(list);
+            sysDept.setDeptId(null);
         }
         startPage();
         sysDept.setJiBie(Integer.valueOf("2"));
@@ -64,11 +65,12 @@ public class StationInfoController extends BaseController
     @GetMapping("/selectStationInfo")
     public TableDataInfo selectStationInfo(SysDept sysDept)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
-        if(selectDeptid !=null && selectDeptid!=""){
-            List<String> list = Arrays.asList(selectDeptid.split(","));
+        if(sysDept!=null &&sysDept.getDeptId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(sysDept.getDeptId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             sysDept.setDeptIdList(list);
+            sysDept.setDeptId(null);
         }
         sysDept.setJiBie(Integer.valueOf("2"));
         List<SysDept> list = sysDeptService.selectDeptList(sysDept);

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

@@ -6,10 +6,12 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.entity.SysRole;
 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.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +46,8 @@ public class StationOilGunController extends BaseController
     private IStationOilGunService stationOilGunService;
     @Autowired
     private ISysUserService sysUserService;
-
+    @Autowired
+    private ISysDeptService sysDeptService;
     /**
      * 查询油枪管理列表
      */
@@ -52,11 +55,12 @@ public class StationOilGunController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationOilGun stationOilGun)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
-        if(selectDeptid !=null && selectDeptid!=""){
-            List<String> list = Arrays.asList(selectDeptid.split(","));
+        if(stationOilGun!=null &&stationOilGun.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationOilGun.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             stationOilGun.setStationIdList(list);
+            stationOilGun.setStationId(null);
         }
         startPage();
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
@@ -71,11 +75,12 @@ public class StationOilGunController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationOilGun stationOilGun)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
-        if(selectDeptid !=null && selectDeptid!=""){
-            List<String> list = Arrays.asList(selectDeptid.split(","));
+        if(stationOilGun!=null &&stationOilGun.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationOilGun.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             stationOilGun.setStationIdList(list);
+            stationOilGun.setStationId(null);
         }
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
         ExcelUtil<StationOilGun> util = new ExcelUtil<StationOilGun>(StationOilGun.class);
@@ -89,11 +94,12 @@ public class StationOilGunController extends BaseController
     @GetMapping(value = "/selectGun")
     public TableDataInfo selectGun(StationOilGun stationOilGun)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
-        if(selectDeptid !=null && selectDeptid!=""){
-            List<String> list = Arrays.asList(selectDeptid.split(","));
+        if(stationOilGun!=null &&stationOilGun.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationOilGun.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             stationOilGun.setStationIdList(list);
+            stationOilGun.setStationId(null);
         }
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
         return getTable(list);

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

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.entity.SysUser;
 import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.utils.SecurityUtils;
@@ -13,6 +14,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.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +53,8 @@ public class StationOilPriceAdjustController extends BaseController
     private IStationOilGunService stationOilGunService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService sysDeptService;
     /**
      * 查询油品调价信息列表
      */
@@ -58,11 +62,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(","));
+        if(stationOilPriceAdjust!=null &&stationOilPriceAdjust.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationOilPriceAdjust.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             stationOilPriceAdjust.setStationIdList(list);
+            stationOilPriceAdjust.setStationId(null);
         }
         startPage();
         List<StationOilPriceAdjust> list = stationOilPriceAdjustService.selectStationOilPriceAdjustList(stationOilPriceAdjust);

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

@@ -6,9 +6,11 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import com.yijia.common.core.domain.entity.SysDept;
 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.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +45,8 @@ public class StationOilPriceController extends BaseController
     private IStationOilPriceService stationOilPriceService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService sysDeptService;
     /**
      * 查询油品价格列表
      */
@@ -50,11 +54,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(","));
+        if(stationOilPrice!=null &&stationOilPrice.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationOilPrice.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             stationOilPrice.setStationIdList(list);
+            stationOilPrice.setStationId(null);
         }
         startPage();
         List<StationOilPrice> list = stationOilPriceService.selectStationOilPriceList(stationOilPrice);
@@ -69,10 +74,12 @@ 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());
+        if(stationOilPrice!=null &&stationOilPrice.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationOilPrice.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
+            stationOilPrice.setStationIdList(list);
+            stationOilPrice.setStationId(null);
         }
         List<StationOilPrice> list = stationOilPriceService.selectStationOilPriceList(stationOilPrice);
         ExcelUtil<StationOilPrice> util = new ExcelUtil<StationOilPrice>(StationOilPrice.class);

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

@@ -3,10 +3,12 @@ package com.yijia.station.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.utils.SecurityUtils;
 import com.yijia.station.domain.StationPic;
 import com.yijia.station.service.IStationPicService;
+import com.yijia.system.service.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +43,8 @@ public class StationPayController extends BaseController
     private IStationPayService stationPayService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService sysDeptService;
     /**
      * 查询油站支付设置列表
      */
@@ -48,11 +52,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(","));
+        if(stationPay!=null &&stationPay.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationPay.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             stationPay.setStationIdList(list);
+            stationPay.setStationId(null);
         }
         startPage();
         List<StationPay> list = stationPayService.selectStationPayList(stationPay);
@@ -67,10 +72,12 @@ 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());
+        if(stationPay!=null &&stationPay.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationPay.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
+            stationPay.setStationIdList(list);
+            stationPay.setStationId(null);
         }
         List<StationPay> list = stationPayService.selectStationPayList(stationPay);
         ExcelUtil<StationPay> util = new ExcelUtil<StationPay>(StationPay.class);

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

@@ -3,8 +3,10 @@ package com.yijia.station.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,8 @@ public class StationPersonnelController extends BaseController
     private IStationPersonnelService stationPersonnelService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService sysDeptService;
     /**
      * 查询油站员工信息列表
      */
@@ -46,11 +50,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(","));
+        if(stationPersonnel!=null &&stationPersonnel.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationPersonnel.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             stationPersonnel.setStationIdList(list);
+            stationPersonnel.setStationId(null);
         }
         startPage();
         List<StationPersonnel> list = stationPersonnelService.selectStationPersonnelList(stationPersonnel);
@@ -65,11 +70,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(","));
+        if(stationPersonnel!=null &&stationPersonnel.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(stationPersonnel.getStationId());
+            List<String> list = sysDeptService.selectDeptId(dept);
             stationPersonnel.setStationIdList(list);
+            stationPersonnel.setStationId(null);
         }
         List<StationPersonnel> list = stationPersonnelService.selectStationPersonnelList(stationPersonnel);
         ExcelUtil<StationPersonnel> util = new ExcelUtil<StationPersonnel>(StationPersonnel.class);

Yijia-SaaS/yijia-station/src/main/main4.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="main6" />
+    <orderEntry type="module" module-name="main5" />
+  </component>
+</module>

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

@@ -107,12 +107,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND date_format(created_date,'%y-%m-%d %H:%i:%s') <= 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>
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by order_id desc
     </select>

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

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
+        order by id desc
     </select>
     
     <select id="selectStationClassesSummaryById" parameterType="Long" resultMap="StationClassesSummaryResult">

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

@@ -31,6 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="date != null "> and date = #{date}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="oilGunType != null  and oilGunType != ''"> and oil_gun_type = #{oilGunType}</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

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNoOil != null  and isNoOil != ''"> and is_no_oil = #{isNoOil}</if>
             <if test="notice != null  and notice != ''"> and notice = #{notice}</if>
         </where>
+        order by  pay_id desc
     </select>
     
     <select id="selectStationPayById" parameterType="Long" resultMap="StationPayResult">

Yijia-SaaS/yijia-station/yijia-station.iml

@@ -5,93 +5,4 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="module" module-name="yijia-common" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.20.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.20.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.20.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.52.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.52.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.52.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.52.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.52.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.52.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.20.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.19" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="module" module-name="yijia-quartz" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="module" module-name="yijia-system" />
-  </component>
 </module>

Yijia-SaaS/yijia-system/src/main/java/com/yijia/system/mapper/SysDeptMapper.java

@@ -117,4 +117,6 @@ public interface SysDeptMapper
     public int deleteDeptById(Long deptId);
 
     public List<SysDept> selectDeptListTree(SysDept dept);
+
+    public List<SysDept> queryDeptList(SysDept dept);
 }

Yijia-SaaS/yijia-system/src/main/java/com/yijia/system/service/ISysDeptService.java

@@ -108,4 +108,18 @@ public interface ISysDeptService
     public int deleteDeptById(Long deptId);
 
     public List<SysDept> selectDeptListTree(SysDept dept);
+
+    /**
+     * 根据当前deptID 获取对应所有的油站id
+     * @param dept
+     * @return
+     */
+    public List<String>  selectDeptId(SysDept dept);
+
+    /**
+     * 根据or 查询
+     * @param dept
+     * @return
+     */
+    public List<SysDept> queryDeptList(SysDept dept);
 }

Yijia-SaaS/yijia-system/src/main/java/com/yijia/system/service/impl/SysDeptServiceImpl.java

@@ -267,6 +267,49 @@ public class SysDeptServiceImpl implements ISysDeptService
     }
 
     /**
+     * 根据当前deptID 获取对应所有的油站id
+     * @param dept
+     * @return
+     */
+    @Override
+    public List<String>  selectDeptId(SysDept dept) {
+        List<String> stringlist = new ArrayList<>();
+        //根据当前的deptId获取当前组织机构的级别
+        SysDept sysDept = deptMapper.selectDeptById(dept.getDeptId());
+        //根据级别获取对应数据
+        if(sysDept !=null &&  sysDept.getJiBie()!=null ){
+            if(sysDept.getJiBie()==0){
+                SysDept sysDept1 =new SysDept();
+                sysDept1.setJiBie(2);
+                List<SysDept> list1 = deptMapper.selectDeptList(sysDept1);
+                for(SysDept dpt1:list1){
+                    stringlist.add(dpt1.getDeptId().toString());
+                }
+            }else if(sysDept.getJiBie()==1){
+                SysDept sysDept2 =new SysDept();
+                sysDept2.setParentId(sysDept.getDeptId());
+                List<SysDept> list2 = deptMapper.selectDeptList(sysDept2);
+                for(SysDept dpt2:list2){
+                    stringlist.add(dpt2.getDeptId().toString());
+                }
+            }else if(sysDept.getJiBie()==2){
+                stringlist.add(sysDept.getDeptId().toString());
+            }
+        }
+        return stringlist;
+    }
+
+    /**
+     * 根据or 查询
+     * @param dept
+     * @return
+     */
+    @Override
+    public List<SysDept> queryDeptList(SysDept dept) {
+        return deptMapper.queryDeptList(dept);
+    }
+
+    /**
      * 递归列表
      */
     private void recursionFn(List<SysDept> list, SysDept t)

Yijia-SaaS/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -39,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
+		<if test="deptId != null">
+			AND dept_id = #{deptId}
+		</if>
 		<if test="jiBie != null">
 			AND ji_bie = #{jiBie}
 		</if>
@@ -51,6 +54,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="status != null and status != ''">
 			AND status = #{status}
 		</if>
+		<if test="deptIdList != null ">
+			and dept_id in
+			<foreach item="item" index="index" collection="deptIdList"
+					 open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+		order by d.parent_id, d.order_num
+    </select>
+	<select id="queryDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+        where d.del_flag = '0'
+		<if test="deptId != null or parentId!=null">
+			<trim prefixOverrides="or" prefix=" and (" suffix=")">
+				<if test="parentId != null and parentId != null">
+					or parent_id = #{parentId}
+				</if>
+				<if test="deptId != null and deptId != null">
+					or dept_id = #{deptId}
+				</if>
+			</trim>
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by d.parent_id, d.order_num