|
@@ -735,11 +735,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
*/
|
|
|
@Override
|
|
|
public List<WarehouseBaseInfo> selectWarehouseSelf(String compId, String personCharge) {
|
|
|
- List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
|
|
|
- .eq("comp_id", compId)
|
|
|
- .eq("warehouse_type","1")
|
|
|
- .eq("person_charge", personCharge)
|
|
|
- .eq("delete_flag", "0"));
|
|
|
+ Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
|
|
|
+ warehouseBaseInfoWrapper.eq("comp_id", compId)
|
|
|
+ .eq("warehouse_type","1").eq("delete_flag", "0");
|
|
|
+ warehouseBaseInfoWrapper.andNew().eq("person_charge", personCharge).or()
|
|
|
+ .like("other_person_charge", personCharge);
|
|
|
+ List<WarehouseBaseInfo> warehouseBaseInfoList=this.selectList(warehouseBaseInfoWrapper);
|
|
|
if (!CollectionUtils.isEmpty(warehouseBaseInfoList)){
|
|
|
for (WarehouseBaseInfo warehouseBaseInfo:warehouseBaseInfoList) {
|
|
|
//查潮粮单价已审核的数据
|