From f5d9a502e20279b6982a95721ba38299ad817f27 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 15 May 2024 11:29:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/pmspurchasebackbill/PmsPurchasebackBillService.java | 6 ------ .../pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index f51559f1fd..b1bdcbe61a 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -30,8 +30,6 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.api.R; -import com.sun.org.apache.regexp.internal.RE; import com.yxt.common.core.result.ResultBean; import com.yxt.pms.biz.pms.pmspurchasebackbill.flowable.*; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo; @@ -40,10 +38,6 @@ import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService; import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBill; import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillService; import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillDetailsVo; -import com.yxt.pms.biz.pms.pmspurchasebill.flowable.*; -import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService; -import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService; -import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService; import com.yxt.pms.feign.base.Rule; import com.yxt.pms.feign.flowable.flow.*; import com.yxt.pms.feign.flowable.flow2.FlowDelegateQuery; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java index 0ea324ac25..a5ce9af63d 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java @@ -62,7 +62,7 @@ public interface PmsSupplierInfoMapper extends BaseMapper { @Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}") int updateBySidIsDelete(String sid); - @Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid}") + @Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'") List choiceSupplierInfo(String createOrgSid); @Select("select * from yxt_base.base_supplier_info where sid = #{sid}")