中间合同合并合同增加ID返回

hx-sale/src/main/java/com/fjhx/sale/entity/intermediate/vo/IntermediateContractVo.java

@@ -57,6 +57,8 @@ public class IntermediateContractVo extends IntermediateContract {
 
     private String opUserName;
 
+    private String userName;
+
     private Map<String,Object> contractMap;
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/intermediate/impl/IntermediateContractServiceImpl.java

@@ -86,16 +86,7 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
         corporationService.attributeAssign(records, IntermediateContractVo::getSellCorporationId, (item, corporation) -> {
             item.setSellCorporationName(corporation.getName());
         });
-//        //赋值中间合同重新赋值过后的买方名称
-//        corporationService.attributeAssign(records, IntermediateContractVo::getBuyCorporationId, (item, corporation) -> {
-//            item.setBuyCorporationName(corporation.getName());
-//        });
-//        //赋值中间合同重新赋值过后的卖方名称
-//        corporationService.attributeAssign(records, IntermediateContractVo::getSellCorporationId, (item, corporation) -> {
-//            item.setSellCorporationName(corporation.getName());
-//        });
-        //赋值最近操作用户
-//        UserUtil.assignmentNickName(records, IntermediateContractVo::getUpdateUser, IntermediateContractVo::setOpUserName);
+        UserUtil.assignmentNickName(records, IntermediateContractVo::getCreateUser, IntermediateContractVo::setUserName);
         return page;
     }
 

hx-sale/src/main/resources/mapper/intermediate/IntermediateContractMapper.xml

@@ -8,7 +8,8 @@
             c.amount,
             c.currency,
             c.sell_corporation_id,
-            c.buy_corporation_id
+            c.buy_corporation_id,
+            d.create_user
         FROM
             documents d
         LEFT JOIN contract c ON d.contract_id = c.id