Commit 8004815c authored by tangwei's avatar tangwei

修改bug

parent 4f01e2a4
...@@ -125,7 +125,7 @@ public class CheckController extends AbstractBaseController { ...@@ -125,7 +125,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckInfoPageParam param, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckInfoPageParam param,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
param.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode()); param.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
param.setOrderBy("checkDate desc"); param.setOrderBy("checkDate desc");
if(commonPageable !=null){ if(commonPageable !=null){
param.setPageNumber(commonPageable.getPageNumber()-1); param.setPageNumber(commonPageable.getPageNumber()-1);
......
...@@ -80,7 +80,7 @@ public class PlanController extends AbstractBaseController { ...@@ -80,7 +80,7 @@ public class PlanController extends AbstractBaseController {
PlanInfoPageParam param =new PlanInfoPageParam(); PlanInfoPageParam param =new PlanInfoPageParam();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
param.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode()); param.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param); List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
......
...@@ -95,7 +95,7 @@ public class RouteController extends AbstractBaseController { ...@@ -95,7 +95,7 @@ public class RouteController extends AbstractBaseController {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
//获取所在公司code //获取所在公司code
String bizOrgCode=reginParams.getPersonIdentity().getCompanyBizOrgCode(); String bizOrgCode=reginParams.getPersonIdentity().getBizOrgCode();
queryRequests.setBizOrgCode(bizOrgCode); queryRequests.setBizOrgCode(bizOrgCode);
if(commonPageable !=null){ if(commonPageable !=null){
queryRequests.setPageNumber(commonPageable.getPageNumber()-1); queryRequests.setPageNumber(commonPageable.getPageNumber()-1);
...@@ -143,7 +143,7 @@ public class RouteController extends AbstractBaseController { ...@@ -143,7 +143,7 @@ public class RouteController extends AbstractBaseController {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode =reginParams.getPersonIdentity().getCompanyBizOrgCode(); String orgCode =reginParams.getPersonIdentity().getBizOrgCode();
//2.查询 //2.查询
List<Route> routeList = routeService.queryRouteListNew(orgCode); List<Route> routeList = routeService.queryRouteListNew(orgCode);
List<Route> list = routeList.stream().filter(e -> e.getIsExist().equals("true")).collect(Collectors.toList()); List<Route> list = routeList.stream().filter(e -> e.getIsExist().equals("true")).collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment