From d1e785cf354b2deee8a5333fdb0b9c018d3eef98 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 22 Jun 2022 15:42:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=81=E8=AE=B8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=9A=84=E7=A7=AF=E5=88=86=E7=B1=BB=E5=88=AB-?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/List4ApplyResultDTO.java |  6 ++--
 .../impl/PointAdditiveRuleServiceImpl.java    | 28 +------------------
 .../resources/mapper/PointAdditiveRuleDao.xml |  8 +++---
 3 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java
index 49fdc3844b..0d74a3fdf2 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java
@@ -3,8 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @program: epmet-cloud
@@ -19,9 +17,9 @@ public class List4ApplyResultDTO implements Serializable {
 
     private String name;
 
-    private String pid;
+//    private String pid;
 
     private Integer pointValue;
 
-    private List<List4ApplyResultDTO> children = new ArrayList<>();
+//    private List<List4ApplyResultDTO> children = new ArrayList<>();
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
index 371c861773..7146f105f1 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
@@ -194,35 +194,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
     @Override
     public Result<List<List4ApplyResultDTO>> list4apply(List4applyFormDTO dto) {
         List<List4ApplyResultDTO> list = baseDao.selectList4apply(dto);
-        List<List4ApplyResultDTO> result = build(list);
-        result.removeIf(category ->CollectionUtils.isEmpty(category.getChildren()));
-        return new Result<List<List4ApplyResultDTO>>().ok(result);
+        return new Result<List<List4ApplyResultDTO>>().ok(list);
     }
 
-    /**
-     * 构建树节点
-     */
-    public static List<List4ApplyResultDTO> build(List<List4ApplyResultDTO> treeNodes) {
-        List<List4ApplyResultDTO> result = new ArrayList<>();
-
-        //list转map
-        Map<String, List4ApplyResultDTO> nodeMap = new LinkedHashMap<>(treeNodes.size());
-        for(List4ApplyResultDTO treeNode : treeNodes){
-            nodeMap.put(treeNode.getId(), treeNode);
-        }
-
-        for(List4ApplyResultDTO node : nodeMap.values()) {
-            List4ApplyResultDTO parent = nodeMap.get(node.getPid());
-            if(parent != null && !(node.getId().equals(parent.getId()))){
-                parent.getChildren().add(node);
-                continue;
-            }
-
-            result.add(node);
-        }
-
-        return result;
-    }
 
     @Override
     public Result<List<PointAdditiveRuleDTO>> list4tree(List4treeFormDTO dto) {
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
index 058d6db765..84a26d63e7 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
@@ -45,8 +45,7 @@
     </select>
     <select id="selectList4apply" resultType="com.epmet.dto.result.List4ApplyResultDTO">
         select  id,
-                if(CATEGORY_NAME is null,RULE_NAME,CATEGORY_NAME) as name,
-                pid,
+                RULE_NAME as name,
                 POINT_VALUE
         from point_additive_rule
         where DEL_FLAG='0'
@@ -55,11 +54,12 @@
                 and APPLY_FLAG= #{applyFlag}
             </if>
             <if test="businessCode != null and businessCode != '' and businessCode == 'point_fine'.toString()">
-                and (( type='rule' and POINT_VALUE &lt; 0 )or TYPE='category')
+                and  POINT_VALUE &lt; 0
             </if>
             <if test="businessCode != null and businessCode != '' and businessCode == 'point_reward'.toString()">
-                and (( type='rule' and POINT_VALUE &gt; 0 )or TYPE='category')
+                and POINT_VALUE &gt; 0
             </if>
+            and type='rule'
 			and CUSTOMER_ID=#{customerId}
         order by UPDATED_TIME desc
     </select>