From 4b5ea82bf000f0f44d7ff24745679dd0857e1257 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 11 May 2020 14:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=20=E5=90=8C=E4=B8=80=E5=8A=A8=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E8=A2=AB=E9=80=89=E6=8B=A9=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java   | 7 ++++++-
 .../src/main/resources/mapper/PointsBehaviorDao.xml       | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java
index cd3b305c..a5b02535 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsBehaviorDTO.java
@@ -92,4 +92,9 @@ public class PointsBehaviorDTO implements Serializable {
      * 虚字段 - 序号
      */
     private Integer orderNumber;
-}
\ No newline at end of file
+
+    /**
+     * 虚字段 - true 动作不可选择  false 动作可选择
+     */
+    private boolean disabled;
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsBehaviorDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsBehaviorDao.xml
index 1210cc6c..aa653112 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsBehaviorDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsBehaviorDao.xml
@@ -50,11 +50,17 @@
     <select id="selectListBehaviorDesc" resultType="com.elink.esua.epdc.dto.PointsBehaviorDTO">
         SELECT
             b.BEHAVIOR_CODE behaviorCode,
-            b.BEHAVIOR_DESC behaviorDesc
+            b.BEHAVIOR_DESC behaviorDesc,
+            case when br.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
         WHERE
             b.DEL_FLAG = 0
+        GROUP BY b.id
     </select>
 
     <select id="selectBehaviorDescItExist" resultType="int">