Commit efa3d440 authored by tangwei's avatar tangwei

修改bug

parent f15e4593
...@@ -1336,7 +1336,12 @@ public class CommandController extends BaseController { ...@@ -1336,7 +1336,12 @@ public class CommandController extends BaseController {
UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId())); UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
id =userCar!=null?userCar.getCarId():null; id =userCar!=null?userCar.getCarId():null;
if(id==null&&isNo!=null&&isNo){
Map map =new HashMap();
map.put("select",null);
map.put("data",null);
return ResponseHelper.buildResponse(null);
}
ResponseModel<Object> data= equipFeignClient.equipmentCarList(teamId,name,code , pageNum,pageSize,id,isNo); 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);
......
...@@ -227,7 +227,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -227,7 +227,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName()); alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo))); alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo)));
// String token = RequestContext.getToken(); // String token = RequestContext.getToken();
// ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(), // ReginParams reginParams = JSONObject.parseObject(.get(RedisredisUtilsKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(),
// ReginParams.class); // ReginParams.class);
// alertSubmitted.setRecUserName(reginParams.getUserModel().getUserName()); // alertSubmitted.setRecUserName(reginParams.getUserModel().getUserName());
// alertSubmitted.setSender(reginParams.getUserModel().getUserName()); // alertSubmitted.setSender(reginParams.getUserModel().getUserName());
......
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