From 491dd0fa7c44b7e8050230910e0a5ed0934fa758 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Fri, 11 Sep 2020 09:47:28 +0800
Subject: [PATCH] fix list -- points behavior

---
 .../resources/mapper/PointsBehaviorDao.xml    | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/epdc-cloud-points/src/main/resources/mapper/PointsBehaviorDao.xml b/epdc-cloud-points/src/main/resources/mapper/PointsBehaviorDao.xml
index 0898697..369121c 100644
--- a/epdc-cloud-points/src/main/resources/mapper/PointsBehaviorDao.xml
+++ b/epdc-cloud-points/src/main/resources/mapper/PointsBehaviorDao.xml
@@ -3,20 +3,6 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.PointsBehaviorDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.PointsBehaviorEntity" id="pointsBehaviorMap">
-        <result property="id" column="ID"/>
-        <result property="behaviorCode" column="BEHAVIOR_CODE"/>
-        <result property="behaviorDesc" column="BEHAVIOR_DESC"/>
-        <result property="behaviorRecordingTime" column="BEHAVIOR_RECORDING_TIME"/>
-        <result property="remark" column="REMARK"/>
-        <result property="revision" column="REVISION"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
     <select id="selectListPointsBehavior" resultType="com.elink.esua.epdc.dto.PointsBehaviorDTO">
         SELECT
         (@i:=@i+1) as orderNumber,
@@ -38,7 +24,6 @@
         b.CREATED_TIME
     </select>
 
-
     <select id="getBehaviorCodeInfoByBehaviorCode" resultType="com.elink.esua.epdc.dto.result.BehaviorResultDto">
         select ID,BEHAVIOR_CODE,BEHAVIOR_DESC,BEHAVIOR_RECORDING_TIME,REMARK,REVISION,DEL_FLAG,CREATED_BY
         ,CREATED_TIME,UPDATED_BY,UPDATED_TIME
@@ -59,13 +44,11 @@
         SELECT
             b.BEHAVIOR_CODE behaviorCode,
             b.BEHAVIOR_DESC behaviorDesc,
-            case when br.ID IS NULL
-                 then false
-                 else true
-                 end disabled
+          CASE WHEN r.ID IS NULL THEN FALSE ELSE TRUE END disabled
         FROM
             `epdc_points_behavior` b
             LEFT JOIN epdc_points_behavior_rule br ON b.id = br.BEHAVIOR_ID AND br.DEL_FLAG = 0
+            LEFT JOIN epdc_points_rule r ON r.id = br.RULE_ID AND r.DEL_FLAG = '0'
         WHERE
             b.DEL_FLAG = 0
         GROUP BY b.id