|
@@ -121,6 +121,13 @@ public class BusinessProductionServiceImpl implements IBusinessProductionService
|
|
ProdValidateVO prodValidateVO = null;
|
|
ProdValidateVO prodValidateVO = null;
|
|
if (MainBusinessEnum.PERSONAL_BUSINESS.name().equals(businessType)){
|
|
if (MainBusinessEnum.PERSONAL_BUSINESS.name().equals(businessType)){
|
|
prodValidateVO = personalTargetMapper.validateProd(businessId);
|
|
prodValidateVO = personalTargetMapper.validateProd(businessId);
|
|
|
|
+ if (StrUtil.isNotBlank(prodValidateVO.getBailorA()) && StrUtil.isNotBlank(prodValidateVO.getBailorB())){
|
|
|
|
+ prodValidateVO.setBailor(prodValidateVO.getBailorA()+"、"+prodValidateVO.getBailorB());
|
|
|
|
+ }else if (StrUtil.isNotBlank(prodValidateVO.getBailorA()) && StrUtil.isBlank(prodValidateVO.getBailorB())){
|
|
|
|
+ prodValidateVO.setBailor(prodValidateVO.getBailorA());
|
|
|
|
+ }else {
|
|
|
|
+ prodValidateVO.setBailor(prodValidateVO.getBailorB());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if (MainBusinessEnum.MAJOR_BUSINESS.name().equals(businessType)){
|
|
if (MainBusinessEnum.MAJOR_BUSINESS.name().equals(businessType)){
|
|
prodValidateVO = majorProductionMapper.validateProd(businessId);
|
|
prodValidateVO = majorProductionMapper.validateProd(businessId);
|