Эх сурвалжийг харах

1、查询企业ID判断;

zk 2 жил өмнө
parent
commit
f8805fe6d1

+ 4 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.StringUtils;
@@ -87,7 +88,7 @@ public class KwfDriverController {
      **/
     @PostMapping("/statistics")
     public HttpResult statistics(@RequestBody Map<String, Object> params) throws SystemException {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         Map countMaps = driverService.statistics(params);
         return HttpResult.ok(countMaps);
     }
@@ -100,7 +101,7 @@ public class KwfDriverController {
      **/
     @PostMapping("/select")
     public HttpResult findPage(@RequestBody Map<String, Object> params) throws SystemException {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         // 设置分页参数
         PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
         List<KwfDriverVo> list = driverService.findPage(params);
@@ -128,7 +129,7 @@ public class KwfDriverController {
      **/
     @PostMapping("/export")
     public void export(@RequestBody Map<String, Object> params) {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         /**分页数据**/
         List<KwfDriverVo> drivers = driverService.findPage(params);
 

+ 3 - 2
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfFleetController.java

@@ -3,6 +3,7 @@ package com.sckw.fleet.controller;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -51,7 +52,7 @@ public class KwfFleetController {
      **/
     @PostMapping("/select")
     public HttpResult findPage(@RequestBody Map<String, Object> params) throws SystemException {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         // 设置分页参数
         PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
         List<KwfFleetVo> list = fleetService.findPage(params);
@@ -79,7 +80,7 @@ public class KwfFleetController {
      **/
     @PostMapping("/export")
     public HttpResult export(@RequestBody Map<String, Object> params) {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         /**查询分页数据**/
         List<KwfFleetVo> fleets = fleetService.findPage(params);
 

+ 4 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
@@ -98,7 +99,7 @@ public class KwfTruckController {
      **/
     @PostMapping("/statistics")
     public HttpResult statistics(@RequestBody Map<String, Object> params) throws SystemException {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         Map countMaps = truckService.statistics(params);
         return HttpResult.ok(countMaps);
     }
@@ -111,7 +112,7 @@ public class KwfTruckController {
      **/
     @PostMapping("/select")
     public HttpResult findPage(@RequestBody Map<String, Object> params) throws SystemException {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         // 设置分页参数
         PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
         List<KwfTruckVo> list = truckService.findPage(params);
@@ -139,7 +140,7 @@ public class KwfTruckController {
      **/
     @PostMapping("/export")
     public HttpResult export(@RequestBody Map<String, Object> params) {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         /**查询数据**/
         List<KwfTruckVo> trucks = truckService.findPage(params);
 

+ 4 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckReportController.java

@@ -3,6 +3,7 @@ package com.sckw.fleet.controller;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -43,7 +44,7 @@ public class KwfTruckReportController {
      **/
     @PostMapping("/statistics")
     public HttpResult statistics(@RequestBody Map<String, Object> params) throws SystemException {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         Map countMaps = reportService.statistics(params);
         return HttpResult.ok(countMaps);
     }
@@ -56,7 +57,7 @@ public class KwfTruckReportController {
      **/
     @PostMapping("/select")
     public HttpResult findPage(@RequestBody Map<String, Object> params) throws SystemException {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         // 设置分页参数
         PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
         List<KwfTruckReportVo> list = reportService.findPage(params);
@@ -72,7 +73,7 @@ public class KwfTruckReportController {
      **/
     @PostMapping("/export")
     public HttpResult export(@RequestBody Map<String, Object> params) {
-        params.put("entId", LoginUserHolder.getEntId());
+        params.put("entId", LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
         /**查询数据**/
         List<KwfTruckReportVo> trucks = reportService.findPage(params);