|
|
@ -79,13 +79,9 @@ public class BasicCorpController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<BasicCorpEntity> basicUnitMaintainEntities;
|
|
|
|
List<BasicCorpEntity> basicUnitMaintainEntities;
|
|
|
|
//是供应商的时候拉客户和供应商
|
|
|
|
//是供应商的时候拉客户和供应商
|
|
|
|
if (basicUnitMaintainFilterRequest.getCorpType() == null) {
|
|
|
|
if (basicUnitMaintainFilterRequest.getCorpType() == null || basicUnitMaintainFilterRequest.getCorpType() == 2) {
|
|
|
|
basicUnitMaintainFilterRequest.setCorpType(2);
|
|
|
|
|
|
|
|
} else if (basicUnitMaintainFilterRequest.getCorpType() == 2) {
|
|
|
|
|
|
|
|
basicUnitMaintainFilterRequest.setCorpType(null);
|
|
|
|
basicUnitMaintainFilterRequest.setCorpType(null);
|
|
|
|
basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2)));
|
|
|
|
basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2)));
|
|
|
|
} else {
|
|
|
|
|
|
|
|
basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
|
|
|
|
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
|
|
|
|
PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
|
|
|
|
PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
|
|
|
@ -153,6 +149,8 @@ public class BasicCorpController {
|
|
|
|
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
|
|
|
|
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
basicUnitMaintainSaveRequest.setOutType(ConstantStatus.CORP_SICK_CUS);
|
|
|
|
|
|
|
|
basicUnitMaintainSaveRequest.setUpdateTime(new Date());
|
|
|
|
basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest);
|
|
|
|
basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest);
|
|
|
|
return ResultVOUtils.success("修改成功");
|
|
|
|
return ResultVOUtils.success("修改成功");
|
|
|
|
}
|
|
|
|
}
|
|
|
|