From 6e9032241ee9d075f0051be69382b33c014aabbc Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Mon, 1 Apr 2024 17:37:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87id=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=BB=87=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=8E=88=E6=9D=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machine/MachineTemplateController.java     |  8 ++++++++
 .../machinetemplate/MachineTemplateMapper.java |  6 ++++--
 .../machine/MachineTemplateService.java        |  2 ++
 .../machine/MachineTemplateServiceImpl.java    |  7 ++++++-
 .../mapper/process/MachineTemplateMapper.xml   | 18 +++++++++++++++---
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java
index 0c1883996..f0b3b8500 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java
@@ -146,5 +146,13 @@ public class MachineTemplateController {
         return success(machineTemplateService.organTemplatePage(page));
     }
 
+    @GetMapping("organ-template-by-organId")
+    @Operation(summary = "根据组织id查询组织模板授权")
+    @PreAuthorize("@ss.hasPermission('machine-template::query')")
+    @Parameter(name = "organId", description = "组织id", required = true, example = "1")
+    public CommonResult<OrganTemplateResp> organTemplateByOrganId(@RequestParam Long organId ) {
+        return success(machineTemplateService.organTemplateByOrganId(organId));
+    }
+
 
 }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java
index a732c8cb3..bb4b56d91 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java
@@ -33,9 +33,11 @@ public interface MachineTemplateMapper extends BaseMapperX<MachineTemplateDO> {
 
     List<AutoTemplateVO>  selectAuthTemplateList(Map<String, Object> map);
 
-    Page<OrganTemplateResp> selectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
+    //Page<OrganTemplateResp> selectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
 
     List<OrganTemplateVO> selectOrganTemplateList(Map<String, Object> map);
 
-    Page<OrganTemplateResp> xxselectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
+    Page<OrganTemplateResp> selectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
+
+    OrganTemplateResp selectOrganTemplate(Long organId);
 }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java
index 5285daea8..3deafa95d 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java
@@ -50,4 +50,6 @@ public interface MachineTemplateService {
     Boolean auth(MachineOrgAuthReq vo);
 
     PageResult<OrganTemplateResp> organTemplatePage(OrganTemplatePage page);
+
+    OrganTemplateResp organTemplateByOrganId(Long organId);
 }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
index ec1edf7aa..aea72587b 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
@@ -278,10 +278,15 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
     @Override
     public PageResult<OrganTemplateResp> organTemplatePage(OrganTemplatePage page) {
         Page<OrganTemplateResp> respPage = new Page<>(page.getPageNo(), page.getPageSize());
-        Page<OrganTemplateResp> pageRes = machineTemplateMapper.xxselectOrganTemplatePage(respPage, page);
+        Page<OrganTemplateResp> pageRes = machineTemplateMapper.selectOrganTemplatePage(respPage, page);
         return new PageResult<>(pageRes.getRecords(), pageRes.getTotal());
     }
 
+    @Override
+    public OrganTemplateResp organTemplateByOrganId(Long organId) {
+        return machineTemplateMapper.selectOrganTemplate(organId);
+    }
+
 
     @Override
     public Boolean deleteCuttingTemplate(Long id) {
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 6ed2b29d2..e0c8d77aa 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
@@ -18,7 +18,7 @@
         <result property="organName" column="organName"/>
         <result property="updateTime" column="updateTime"/>
         <collection property="authTemplateList" javaType="java.util.List" ofType="com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateVO"
-                    select="selectOrganTemplateList" column="{organId=organId, templateName = templateName}" notNullColumn="templateId" >
+                    select="selectOrganTemplateList" column="{organId=organId}"  >
         </collection>
     </resultMap>
 
@@ -66,7 +66,7 @@
         </where>
     </select>
 
-    <select id="selectOrganTemplatePage" resultMap="orgMap">
+    <!--<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
@@ -79,7 +79,7 @@
         GROUP BY organId
         order by updateTime desc
 
-    </select>
+    </select>-->
 
     <select id="selectOrganTemplateList"
             resultType="com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateVO">
@@ -94,6 +94,7 @@
             </if>
         </where>
     </select>
+
     <select id="xxselectOrganTemplatePage" resultMap="xxMap">
         select *  from (
             select a.id as organId, a.name as organName, max(b.create_time) as updateTime,
@@ -121,4 +122,15 @@
         order by updateTime desc
 
     </select>
+
+    <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
+        <where>
+            a.id = b.organ_id
+            and a.id = #{vo.organId}
+        </where>
+        GROUP BY organId
+
+    </select>
 </mapper>
\ No newline at end of file