修改

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -56,28 +56,28 @@
             and id = #{CorpsDesc.id}
         </if>
         <if test="CorpsDesc.code!=null and CorpsDesc.code != ''">
-            and code = #{CorpsDesc.code}
+            and code like CONCAT(CONCAT('%', #{CorpsDesc.code}), '%')
         </if>
         <if test="CorpsDesc.cname!=null and CorpsDesc.cname != ''">
-            and cname = #{CorpsDesc.cname}
+            and cname like CONCAT(CONCAT('%', #{CorpsDesc.cname}), '%')
         </if>
         <if test="CorpsDesc.enname!=null and CorpsDesc.enname != ''">
             and enname = #{CorpsDesc.enname}
         </if>
         <if test="CorpsDesc.goodtypes!=null and CorpsDesc.goodtypes != ''">
-            and goodtypes = #{CorpsDesc.goodtypes}
+            and goodtypes like CONCAT(CONCAT('%', #{CorpsDesc.goodtypes}), '%')
         </if>
         <if test="CorpsDesc.belongtocompany!=null and CorpsDesc.belongtocompany != ''">
-            and belongtocompany = #{CorpsDesc.belongtocompany}
+            and belongtocompany like CONCAT(CONCAT('%',  #{CorpsDesc.belongtocompany}), '%')
         </if>
         <if test="CorpsDesc.companytype!=null and CorpsDesc.companytype != ''">
             and companytype = #{CorpsDesc.companytype}
         </if>
         <if test="CorpsDesc.belongtoarea!=null and CorpsDesc.belongtoarea != ''">
-            and belongtoarea = #{CorpsDesc.belongtoarea}
+            and belongtoarea like CONCAT(CONCAT('%',  #{CorpsDesc.belongtoarea}), '%')
         </if>
         <if test="CorpsDesc.attn!=null and CorpsDesc.attn != ''">
-            and attn = #{CorpsDesc.attn}
+            and attn like CONCAT(CONCAT('%',  #{CorpsDesc.attn}), '%')
         </if>
         <if test="CorpsDesc.tel!=null and CorpsDesc.tel != ''">
             and tel = #{CorpsDesc.tel}
@@ -125,7 +125,7 @@
             and creditstatus = #{CorpsDesc.creditstatus}
         </if>
         <if test="CorpsDesc.creditLevel!=null and CorpsDesc.creditLevel != ''">
-            and credit_level = #{CorpsDesc.creditLevel}
+            and credit_level like CONCAT(CONCAT('%',  #{CorpsDesc.creditLevel}), '%')
         </if>
         <if test="CorpsDesc.creditGrant!=null">
             and credit_grant = #{CorpsDesc.creditGrant}

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java

@@ -35,6 +35,7 @@ import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -90,6 +91,8 @@ public class SettlementController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入settlement")
 	public R<IPage<Settlement>> list(Settlement settlement, Query query) {
+		settlement.setTenantId(SecureUtil.getTenantId());
+		settlement.setIsDeleted(0);
 		IPage<Settlement> pages = settlementService.page(Condition.getPage(query), Condition.getQueryWrapper(settlement));
 		List<Settlement> settlementList = pages.getRecords();
 		if(CollectionUtils.isNotEmpty(settlementList))

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/PurchaseEnquiry.java

@@ -221,7 +221,7 @@ public class PurchaseEnquiry  extends BladeController {
 		if (order.getId() == null){
 			throw new RuntimeException("请选择确认的单据");
 		}
-		if (StringUtils.isNotBlank(order.getOrderStatus()) && order.getOrderStatus().equals("已提交")) {
+		if (StringUtils.isNotBlank(order.getOrderStatus()) && order.getOrderStatus().equals("询价确认")) {
 			throw new RuntimeException("请勿重复提交");
 		}
 		order.setBillType(OrderTypeEnum.PURCHASE_ENQUIRY.getType());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -258,6 +258,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
 		if (CollectionUtils.isNotEmpty(list)){
 			list.stream().forEach(item ->{
+				item.setSrcId(item.getId());
 				item.setId(null);
 				item.setPid(purchaseEnquiry.getId());
 				item.setUpdateUser(SecureUtil.getUserId());