From e5115fe21a06dae7922f5f71e5330c1897a9fc67 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Fri, 12 Apr 2024 08:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=8F=B0=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=9D=83=E9=99=90=E8=A1=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/machinetemplate/OrganMachineDO.java |  2 +-
 .../resources/mapper/process/MachineTemplateMapper.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/OrganMachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/OrganMachineDO.java
index 53eedcc3f..6b97dc91c 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/OrganMachineDO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/OrganMachineDO.java
@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
  * @author Beal
  */
 @Data
-@TableName("system_organ_machine")
+@TableName("system_machine_template_limit")
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml
index 40ef4e568..71ede804e 100644
--- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml
+++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml
@@ -69,7 +69,7 @@
     <!--<select id="selectOrganTemplatePage" resultMap="orgMap">
         select a.id as organId, a.name as organName, max(b.create_time) as updateTime,
         case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName
-        from system_organization a, system_organ_machine b
+        from system_organization a, system_machine_template_limit b
         <where>
             a.id = b.organ_id
             <if test="vo.organId != null">
@@ -85,7 +85,7 @@
             resultType="com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateVO">
         select b.organ_id organId, b.show_prior_facing, b.show_dual_workstation, b.show_auto_note_printer,
                c.name AS templateName, c.id AS templateId, c.machine_type
-        from system_organ_machine b
+        from system_machine_template_limit b
         inner join system_machine_template c on b.machine_id = c.id and c.deleted = 0
         <where>
             b.organ_id = #{organId}
@@ -99,7 +99,7 @@
         select *  from (
             select a.id as organId, a.name as organName, max(b.create_time) as updateTime,
             case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName
-            from system_organization a, system_organ_machine b
+            from system_organization a, system_machine_template_limit b
             <where>
                 a.id = b.organ_id
                 <if test="vo.organId !=null">
@@ -110,7 +110,7 @@
         ) t1
             LEFT JOIN (
             select b.organ_id t2_organId
-            from system_organ_machine b inner join system_machine_template c on b.machine_id = c.id and c.deleted = 0
+            from system_machine_template_limit b inner join system_machine_template c on b.machine_id = c.id and c.deleted = 0
             <where>
                 <if test="vo.templateName !=null and vo.templateName !='' " >
                     c.name like concat('%',#{vo.templateName},'%')
@@ -125,7 +125,7 @@
 
     <select id="selectOrganTemplate" resultMap="orgMap">
         select a.id as organId, a.name as organName, max(b.create_time) as updateTime
-        from system_organization a, system_organ_machine b
+        from system_organization a, system_machine_template_limit b
         <where>
             a.id = b.organ_id
             and a.id = #{vo.organId}