From 28933de278645febaf4fafc9ec34a2a207c12933 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Fri, 16 Mar 2018 23:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/ActMonDelaySettleServiceImp.java        | 10 ++++------
 .../manage/mappers/act/ActMonDelaySettleMapper.xml     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java
index 3564187dc..8c9c1a9d0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java
@@ -17,11 +17,9 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -65,7 +63,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
         JSONObject res = new JSONObject();
         Boolean apply = false;
-        if (!clientLogs.isEmpty() && clientLogs.size() > 0) {
+        if (!clientLogs.isEmpty()) {
             apply = true;
         }
         if (new Date().compareTo(act.getDate("active_date")) < 0) {
@@ -90,7 +88,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
     @Override
     public void actApply(JSONObject device) {
         JSONObject act = actAppMapper.getActDetail("1");
-        Assert.notNull(act,"The activity is not valid");
+        Assert.notNull(act, "The activity is not valid");
         if (!act.getBoolean("is_valid")) {
             throw new BadRequestException("The activity is not valid");
         }
@@ -104,7 +102,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         deviceSupport.findRegister(clientType);
         int client_id = device.getIntValue("client_id");
         List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
-        if (!clientLogs.isEmpty() && clientLogs.size() > 0) {
+        if (!clientLogs.isEmpty()) {
             throw new BadRequestException("您已经参与过活动，无需重复报名");
         }
         JSONObject account = clientAccountMapper.findById(device.getString("account_id"));
@@ -125,7 +123,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         deviceSupport.findRegister(clientType);
         int client_id = device.getIntValue("client_id");
         List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
-        if (clientLogs.isEmpty() || clientLogs.size() == 0) {
+        if (clientLogs.isEmpty()) {
             throw new BadRequestException("您未参加活动,不可取消");
         }
         JSONObject clientLog = clientLogs.get(0);
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.xml
index 622687a1d..148b52ee4 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.xml
@@ -4,7 +4,7 @@
     <select id="listAttendClients" resultType="com.alibaba.fastjson.JSONObject">
         select act.account_name,act.create_time,act.client_id,c.client_moniker
         FROM act_mon_delay_settle act
-        LEFT JOIN sys_clients c ON act.client_id = c.client_id
+        INNER JOIN sys_clients c ON act.client_id = c.client_id
         <where>
             act.is_valid = 1 and  c.is_valid = 1
             <if test="client_moniker!=null">and c.client_moniker = #{client_moniker}</if>