yumeng 2 anni fa
parent
commit
62befa8185

+ 6 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouSettlementRulesController.java

@@ -32,6 +32,9 @@ public class KuaishouSettlementRulesController extends BaseController {
     @GetMapping("/getRuleList")
     public TableDataInfo list(Long userId, String ruleName) {
         startPage();
+        if(userId == 1){
+            userId = null;
+        }
         List<JSONObject> list = kuaishouSettlementRulesService.getRuleList(userId, ruleName);
         return getDataTable(list);
     }
@@ -39,6 +42,9 @@ public class KuaishouSettlementRulesController extends BaseController {
     @GetMapping("/getRuleListNoPage")
     public JSONObject getRuleListNoPage(Long userId, String ruleNam) {
         JSONObject returnJson = new JSONObject();
+        if(userId == 1){
+            userId = null;
+        }
         List<JSONObject> data = kuaishouSettlementRulesService.getRuleList(userId, ruleNam);
         returnJson.put("code", 0);
         returnJson.put("message", "true");

+ 19 - 14
ruixuan-live/src/main/resources/mapper/isc/KuaishouSettlementRulesMapper.xml

@@ -35,6 +35,8 @@
         where id = #{id}
     </select>
     <select id="getRuleList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
+
+        select * from (
         select id as 'id',
         rule_name as 'ruleName',
         rule_type as 'ruleType',
@@ -46,20 +48,23 @@
         <if test="ruleName != null and ruleName != ''">
             and rule_name like concat('%',#{ruleName}, '%')
         </if>
-
-            union all
-            select id as 'id',
-            rule_name as 'ruleName',
-            rule_type as 'ruleType',
-            user_id as 'userId',
-            user_name as 'userName',
-            create_time as 'createTime'
-            from kuaishou_settlement_rules
-            where user_id = #{userId}
-            <if test="ruleName != null and ruleName != ''">
-                and rule_name like concat('%',#{ruleName}, '%')
-            </if>
-            order by createTime desc
+        union all
+        select id as 'id',
+        rule_name as 'ruleName',
+        rule_type as 'ruleType',
+        user_id as 'userId',
+        user_name as 'userName',
+        create_time as 'createTime'
+        from kuaishou_settlement_rules
+        where 1= 1
+        <if test="userId != null and userId != ''">
+            and user_id = #{userId}
+        </if>
+        <if test="ruleName != null and ruleName != ''">
+            and rule_name like concat('%',#{ruleName}, '%')
+        </if>
+        order by createTime desc
+        ) t group t.id
 
     </select>
     <select id="getMaxRuleId" resultType="java.lang.Long">