Bug修复出现了两个杆塔G,线路工程管理页面上做了数据隔离,导出时,未做数据隔离
This commit is contained in:
parent
e38496d070
commit
a26fbb6a4a
|
|
@ -170,7 +170,9 @@ public class TbProjectServiceImpl implements TbProjectService {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<TbProjectVo> tbProjectExport(TbProjectVo data) {
|
public List<TbProjectVo> tbProjectExport(TbProjectVo data) {
|
||||||
List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
|
List<Long> deptIds = UserUtil.getLoginUser().getDeparts();
|
||||||
return tbProjectVoList;
|
data.setDeptIds(deptIds);
|
||||||
|
List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
|
||||||
|
return tbProjectVoList;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@
|
||||||
tts.highway_width AS highwayWidth
|
tts.highway_width AS highwayWidth
|
||||||
FROM tb_three_span tts
|
FROM tb_three_span tts
|
||||||
LEFT JOIN tb_tower tt ON tts.tower_id = tt.id
|
LEFT JOIN tb_tower tt ON tts.tower_id = tt.id
|
||||||
LEFT JOIN tb_tower tt2 ON tts.tower_id = tt2.id
|
LEFT JOIN tb_tower tt2 ON tts.next_tower_id = tt2.id
|
||||||
WHERE tts.pro_id = #{id} AND is_active = '1'
|
WHERE tts.pro_id = #{id} AND is_active = '1'
|
||||||
</select>
|
</select>
|
||||||
<!--查询索道运输信息-->
|
<!--查询索道运输信息-->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue