提交

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/funds/v2/service/impl/RequestFundsV2ServiceImpl.java

@@ -25,6 +25,8 @@ import com.fjhx.activiti.SubmitFlowCondition;
 import com.fjhx.activiti.feign.IActivitiApi;
 import com.fjhx.common.attachment.IAttachmentApi;
 import com.fjhx.company.entity.Company;
+import com.fjhx.company.entity.CompanyBasics;
+import com.fjhx.company.service.ICompanyBasicsService;
 import com.fjhx.company.service.ICompanyService;
 import com.fjhx.contract.constant.ContractConstant;
 import com.fjhx.contract.entity.Contract;
@@ -126,6 +128,10 @@ public class RequestFundsV2ServiceImpl extends BasicsServiceImpl<RequestFundsV2M
     @Autowired
     private ICompanyService iCompanyService;
 
+
+    @Autowired
+    private ICompanyBasicsService companyBasicsService;
+
     /**
      * 列表
      *
@@ -932,7 +938,7 @@ public class RequestFundsV2ServiceImpl extends BasicsServiceImpl<RequestFundsV2M
         }
 
         // 查询公司信息
-        Company company = iCompanyService.getById(requestFundsV2.getCompanyId());
+        CompanyBasics company = companyBasicsService.getById(requestFundsV2.getCompanyId());
         if (company != null) {
             requestFundsV2.setCompanyName(company.getNameChinese());
         }

bladex-saas-project/saas-entity/src/main/java/com/fjhx/contract/entity/ContractProduct.java

@@ -232,4 +232,10 @@ public class ContractProduct extends BasicsEntity {
      */
     @TableField(exist = false)
     private String customerName;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
 }

bladex-saas-project/saas-entity/src/main/java/com/fjhx/shipmentdetailed/entity/ShipmentDetailed.java

@@ -62,4 +62,9 @@ public class ShipmentDetailed extends BasicsEntity {
     @TableField(exist = false)
     private String rowId;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
 }