修改bug

master
wangwei 2 years ago
parent 5df7e2e95e
commit 7b89981fa3

@ -37,6 +37,11 @@ public class ThrInvWarehouseController {
@GetMapping("/thirdSys/sub/inv/warehouse/filter") @GetMapping("/thirdSys/sub/inv/warehouse/filter")
public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) { public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest); List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
ThrDeptEntity thrDeptEntity = thrDeptService.selectByCode(filterThrSubInvWarehouseRequest.getParentId(), filterThrSubInvWarehouseRequest.getThirdSysFk());
for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
thrInvWarehouseEntity.setParentName(thrDeptEntity.getName());
}
PageInfo<ThrInvWarehouseEntity> pageInfo; PageInfo<ThrInvWarehouseEntity> pageInfo;
pageInfo = new PageInfo<>(thrInvWarehouseEntities); pageInfo = new PageInfo<>(thrInvWarehouseEntities);
PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();

@ -12,6 +12,7 @@ public class ThrInvWarehouseEntity {
private String parentId; private String parentId;
private String remark; private String remark;
private String thirdSysFk; private String thirdSysFk;
private String parentName;
} }

@ -138,7 +138,7 @@
<select id="selectByCode" resultType="com.glxp.api.entity.thrsys.ThrDeptEntity"> <select id="selectByCode" resultType="com.glxp.api.entity.thrsys.ThrDeptEntity">
select * select *
from thr_dept from thr_dept
where code = #{code} where code = #{code} and thirdSysFk = #{thirdSysFk}
</select> </select>
<select id="selectMaxCode" resultType="com.glxp.api.entity.thrsys.ThrDeptEntity"> <select id="selectMaxCode" resultType="com.glxp.api.entity.thrsys.ThrDeptEntity">

Loading…
Cancel
Save