From 48b070f1d45ec576d95f66fba4bca09a9fb8e700 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Fri, 17 May 2024 15:53:12 +0800
Subject: [PATCH 1/2] 1

---
 yxt-as-ui/src/views/warehouse/warehouseArea/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
index 864b5fbc03..4d85a841d7 100644
--- a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
@@ -56,8 +56,8 @@
             </el-table-column> -->
             <el-table-column label="是否可用" align="center" width="140">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.usageStatus" active-text="是" inactive-text="否" active-value="0"
-                  inactive-value="1" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
+                <el-switch v-model="scope.row.usageStatus" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
               </template>
             </el-table-column>
             <el-table-column prop="areaName" label="库区名称" align="center" />

From bbaca55e00a78cb491f1bcf335a747764f1d9973 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 17 May 2024 15:54:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=8D=95=E4=BD=8D=E6=8E=92=E9=99=A4=E6=8E=89?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=8D=B3=E5=8F=AA=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BAisDelete=3D0=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
index 56f25a24c5..49ea10ddb5 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
@@ -130,12 +130,12 @@
         select name companyInvoicingName, sid companyInvoicingSid, purchaseSystemSid, purchaseSystemName
         from fin_company_invoicing
         where useOrgSid = #{useOrgSid}
-          and length(purchaseSystemSid) > 0
+          and length(purchaseSystemSid) > 0 and isDelete = 0
     </select>
 
     <select id="getAppInvoicingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.AppCompanyInvoicingVo">
         select name dictValue,sid as id,purchaseSystemSid,purchaseSystemName from fin_company_invoicing where useOrgSid
-        = #{useOrgSid} and length(purchaseSystemSid)>0
+        = #{useOrgSid} and length(purchaseSystemSid)>0 and isDelete = 0
         <if test="search != null and search != ''">
             and name like concat('%',#{search},'%')
         </if>