From ed1e288ec21d3cde4991226098061913c4869d39 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Wed, 19 Apr 2023 17:50:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95=E4=BF=AE=E5=A4=8D&&?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=A8=A1=E7=89=88=E9=85=8D=E7=BD=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml | 2 +-
 .../main/java/com/njcn/system/mapper/TemplateRelMapper.java   | 2 ++
 .../java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml | 4 ++++
 .../com/njcn/system/service/impl/EventDictServiceImpl.java    | 4 ++--
 .../njcn/system/service/impl/EventTemplateServiceImpl.java    | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
index f1b931f62..935973766 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
@@ -74,7 +74,7 @@
         line.`Level`as 'Level',
         line.Update_Time AS 'updateTime',
         line.Sort as 'sort',
-        pd.Call_Flag as 'ComFlag',
+        pd.Com_Flag as 'ComFlag',
         sdd.`Name` AS 'LineScale',
         device.`Name` AS 'deviceName',
         pd.IP AS 'ip',
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java
index b413781d1..f951891d0 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java
@@ -22,4 +22,6 @@ public interface TemplateRelMapper extends BaseMapper<TemplateRel> {
     List<TemplateRel> selectRelevance(@Param("ids") List<String> ids);
 
     boolean batchInsert(@Param("list") List<TemplateRel> list);
+
+    boolean deleteByRtId(@Param("rtId") String id);
 }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml
index 5f3bef594..cf1ca27c7 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml
@@ -13,6 +13,10 @@
         </foreach>
     </insert>
 
+    <delete id="deleteByRtId">
+        DELETE FROM report_relevancy WHERE Rt_Id=#{rtId}
+    </delete>
+
     <select id="selectRelevance" resultType="TemplateRel">
         select report_relevancy.*
         from report_relevancy report_relevancy
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java
index e9807cd5d..619d3fd3e 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java
@@ -114,8 +114,8 @@ public class EventDictServiceImpl extends ServiceImpl<EventDictMapper, ReportDic
             //排序
             if (ObjectUtil.isAllNotEmpty(dictQueryParam.getSortBy(), dictQueryParam.getOrderBy())) {
                 queryWrapper.orderBy(true, dictQueryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(dictQueryParam.getSortBy()));
-            }else{
-                //queryWrapper.eq("report_dict.pid",dictQueryParam.getPid());
+            } else {
+                queryWrapper.eq("report_dict.pid",dictQueryParam.getPid());
                 //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
                 queryWrapper.orderBy(true, true, "report_dict.update_time");
             }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
index ba11c7a50..9dd05985c 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
@@ -127,7 +127,7 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
         BeanUtils.copyProperties(eventTemplateUpdateParam,eventTemplate);
         boolean flag = this.updateById(eventTemplate);
         // 先删除字典表
-        templateRelMapper.deleteById(id);
+        templateRelMapper.deleteByRtId(id);
         List<TemplateRel> list = new ArrayList<>();
         eventTemplateUpdateParam.getIds().forEach(rdId -> {
             TemplateRel relevancy = new TemplateRel();