From 8ce954ae740933049657f1ef31f96dda9994632a Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Fri, 5 Jun 2020 17:36:34 +0800
Subject: [PATCH] p

---
 .../gszc/service/impl/CustomServiceImpl.java   | 18 +++++++++++-------
 .../gszc/service/impl/InvoiceServiceImpl.java  |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
index e255a1b..cea9b3f 100644
--- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
@@ -102,15 +102,19 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
     public JSONArray customList(String userId,String type){
         JSONArray jsonArray = new JSONArray();
 
-        Wrapper<Custom> miniUserId = new EntityWrapper<Custom>().eq("mini_user_id", userId).ne("status_code","logout");
+        Wrapper<Custom> miniUserId = new EntityWrapper<Custom>().eq("mini_user_id", userId);
+
         if(null==type){
+            miniUserId.ne("status_code","logout");
+            if(type.equals("todo")){
+                miniUserId.eq("status_code","todo");
+            }else if(type.equals("disable")){
+                miniUserId.eq("status_code","disable");
+            }else if(type.equals("enable")){
+                miniUserId.eq("status_code","enable");
+            }
+        }else if(type.equals("all")){
 
-        }else if(type.equals("todo")){
-            miniUserId.eq("status_code","todo");
-        }else if(type.equals("disable")){
-            miniUserId.eq("status_code","disable");
-        }else if(type.equals("enable")){
-            miniUserId.eq("status_code","enable");
         }
         miniUserId.orderBy("create_date", false);
         List<Custom> customs = customMapper.selectList(miniUserId);
diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
index 19f38ec..d5180d8 100644
--- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
@@ -87,7 +87,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
 
     public List<Invoice> invoiceList(String userId, String type) {
         List<Invoice> list = new ArrayList<>();
-        JSONArray customs = customService.customList(userId, null);
+        JSONArray customs = customService.customList(userId, "all");
         for (int i = 0; i < customs.size(); i++) {
             Wrapper<Invoice> customId = new EntityWrapper<Invoice>().eq("custom_id", customs.getJSONObject(i).getJSONObject("custom").getString("id"));
             if (null == type) {