Commit 85f52c13 authored by tangwei's avatar tangwei

修改bug

parent 7c2ae76d
...@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.controller; ...@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto; import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
...@@ -1094,7 +1095,11 @@ public class CarController extends AbstractBaseController { ...@@ -1094,7 +1095,11 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "获取车辆物联信息", notes = "获取车辆物联信息") @ApiOperation(httpMethod = "GET", value = "获取车辆物联信息", notes = "获取车辆物联信息")
public Map<Long, List<CarIndexVo>> getCarsIotInfo() { public Map<Long, List<CarIndexVo>> getCarsIotInfo() {
Map<Long, List<CarIndexVo>> map = null; Map<Long, List<CarIndexVo>> map = null;
String orgCode = getOrgCode(); // String orgCode = getOrgCode();
ReginParams ReginParams=getSelectedOrgInfo();
String orgCode= ReginParams.getPersonIdentity().getBizOrgCode();
List<CarIndexVo> carVoList = iCarService.getCarsIotInfo(orgCode); List<CarIndexVo> carVoList = iCarService.getCarsIotInfo(orgCode);
if (!carVoList.isEmpty()) { if (!carVoList.isEmpty()) {
map = carVoList.stream().collect(Collectors.groupingBy(vo -> vo.getId())); map = carVoList.stream().collect(Collectors.groupingBy(vo -> vo.getId()));
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
WHERE WHERE
1=1 1=1
<if test="orgCode != null and orgCode != ''"> <if test="orgCode != null and orgCode != ''">
AND c.org_code = #{orgCode} AND c.biz_org_code = #{orgCode}
</if> </if>
AND c.id = cp.car_id AND c.id = cp.car_id
AND cp.equipment_index_id = ei.id AND cp.equipment_index_id = ei.id
......
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