|
|
@@ -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);
|
|
|
|