浏览代码

优化:产品管理修改关联主体。

lym 4 年之前
父节点
当前提交
43a941f4c9

+ 7 - 1
carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/ProductInfoServiceImpl.java

@@ -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);
                     //前端显示选择贫困集体信息