1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ExpenseInfo.java

@@ -397,7 +397,6 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
     /**
      * 发起人
      */
-    @TableField(exist = false)
     private String creater;
     /**
      * 去重集合标识（1流向2费用名称3未分配4经办人）

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -286,7 +286,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                     taskId = jsonObject.getString("taskId");
                     expenseInfo1.setTaskId(taskId);
                 }
-                if (expenseInfo1.getCreateUserId() != null) {
+                if (expenseInfo1.getCreateUserId() != null&& expenseInfo1.getCreater()==null) {
                     CommonStaff commonStaff = staffService.getInfo(expenseInfo1.getCreateUserId());
                     expenseInfo1.setCreater(commonStaff.getStaffName());
                 }
@@ -324,7 +324,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
     @Override
     public ExpenseInfo getInfo(String id) {
         ExpenseInfo expenseInfo = this.selectById(id);
-        if (expenseInfo.getCreateUserId() != null) {
+        if (expenseInfo.getCreateUserId() != null&&expenseInfo.getCreater()==null) {
             CommonStaff commonStaff = staffService.getInfo(expenseInfo.getCreateUserId());
             expenseInfo.setCreater(commonStaff.getStaffName());
         }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1520,16 +1520,6 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
     public String payMoney(WarehousingOrder warehousingOrder) {
         List<WarehousingOrder> warehousingOrderList = warehousingOrder.getWarehousingOrderList();
         if (!CollectionUtils.isEmpty(warehousingOrderList)) {
-            String createUserId="";
-            CommonStaff commonStaff = staffService.selectOne(new EntityWrapper<CommonStaff>()
-                    .eq("staff_name", warehousingOrderList.get(0).getRequestPerson())
-                    .eq("comp_id", warehousingOrderList.get(0).getCompId()));
-            if (commonStaff!=null){
-                createUserId=commonStaff.getStaffId();
-            }
-            else{
-                createUserId=AuthSecurityUtils.getCurrentUserId();
-            }
             //付款多条
             if ("0".equals(warehousingOrder.getFlag())) {
                 for (WarehousingOrder warehousingOrder1 : warehousingOrderList) {
@@ -1569,7 +1559,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     expenseInfo.setExpensesPurpose("1");
                     expenseInfo.setContractNo(warehousingOrder2.getContractNo());
                     expenseInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
-                    expenseInfo.setCreateUserId(createUserId);
+                    expenseInfo.setCreater(warehousingOrder1.getRequestPerson());
                     expenseInfo.setAddressUrl(warehousingOrder1.getAddressUrl());
                     expenseInfoService.insert(expenseInfo);
                     //全部付款
@@ -1680,7 +1670,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 expenseInfo.setContractNo(warehousingOrder1.getContractNo());
                 expenseInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
                 expenseInfo.setUnallocatedAmount(0d);
-                expenseInfo.setCreateUserId(createUserId);
+                expenseInfo.setCreateUserId(AuthSecurityUtils.getCurrentUserId());
                 expenseInfoService.insert(expenseInfo);
                 // 先删除任务
                 noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "WAREHOUSING-ORDER-APPROVE",

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ExpenseInfoMapper.xml

@@ -176,6 +176,7 @@
         address_url as addressUrl,
         storage_fee_flag as storageFeeFlag,
         agent,
+        creater,
         status,
         remark,
         payee,