Commit 70e87bb8 authored by tangwei's avatar tangwei

修改bug

parent d7c7991a
...@@ -85,7 +85,8 @@ public interface EquipFeignClient { ...@@ -85,7 +85,8 @@ public interface EquipFeignClient {
@RequestParam String code , @RequestParam String code ,
@RequestParam String pageNum, @RequestParam String pageNum,
@RequestParam String pageSize, @RequestParam String pageSize,
@RequestParam Long id); @RequestParam Long id,
@RequestParam Boolean isNo );
......
...@@ -1334,10 +1334,10 @@ public class CommandController extends BaseController { ...@@ -1334,10 +1334,10 @@ public class CommandController extends BaseController {
Long id =null; Long id =null;
//获取用户已绑定车辆id、 //获取用户已绑定车辆id、
UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId())); UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
if(isNo!=null&&isNo){
id =userCar!=null?userCar.getCarId():null; id =userCar!=null?userCar.getCarId():null;
}
ResponseModel<Object> data= equipFeignClient.equipmentCarList(teamId,name,code , pageNum,pageSize,id); ResponseModel<Object> data= equipFeignClient.equipmentCarList(teamId,name,code , pageNum,pageSize,id,isNo);
Map map =new HashMap(); Map map =new HashMap();
map.put("select",userCar!=null?userCar.getCarId():null); map.put("select",userCar!=null?userCar.getCarId():null);
map.put("data",data!=null?data.getResult():null); map.put("data",data!=null?data.getResult():null);
......
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