|
@@ -304,8 +304,13 @@ public class ProductInfoServiceImpl implements ProductInfoService {
|
|
|
productBelong.setCreateTime(new Date());
|
|
|
productBelong.setModifiedTime(new Date());
|
|
|
productBelong.setState(1);
|
|
|
- productBelong.setFkFarmerGuid(productBelongForm.getGuid());
|
|
|
+ if (StringUtils.isNotEmpty(productBelongForm.getFkFarmerGuid())){ //修改
|
|
|
+ productBelong.setFkFarmerGuid(productBelongForm.getFkFarmerGuid());
|
|
|
+ }else {
|
|
|
+ productBelong.setFkFarmerGuid(productBelongForm.getGuid());
|
|
|
+ }
|
|
|
productBelong.setBelongType(1);
|
|
|
+ productBelong.setFarmerNum(productBelongForm.getFarmerNum());
|
|
|
productBelongs.add(productBelong);
|
|
|
}
|
|
|
return productBelongs;
|
|
@@ -580,6 +585,7 @@ public class ProductInfoServiceImpl implements ProductInfoService {
|
|
|
if (productBelong.getBelongType() == 2 && StringUtils.isNotEmpty(productBelong.getFkCollectiveGuid())){
|
|
|
List<CollectiveFarmerForm> collectiveFarmerFormList = new ArrayList<>();
|
|
|
CollectiveFarmerForm collectiveFarmerForm = BeanCopyUtil.convertBean(productBelong,CollectiveFarmerForm.class);
|
|
|
+ collectiveFarmerForm.setGuid(productBelong.getFkCollectiveGuid());
|
|
|
collectiveFarmerFormList.add(collectiveFarmerForm);
|
|
|
info.setCollectiveFarmerForm(collectiveFarmerFormList);
|
|
|
//前端显示选择贫困集体信息
|