From fb876d0e7ed47cb862d9796d26d7a9e24f3f6999 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 24 Jul 2020 10:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AD=BE=E5=88=B0bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-user-server/src/main/resources/mapper/UserDao.xml      | 2 +-
 .../epdc-user-server/src/main/resources/mapper/UserSignDao.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 3376dd0a..d6fa53fc 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -29,7 +29,7 @@
             ELSE
             IFNULL(FLOOR(IFNULL(eu.POINTS_TOTLE,0) / IFNULL(g.POINTS,0) * IFNULL(g.GRADE,0)),0)
             END grade,
-            date_format(eus.LAST_SIGN_TIME,'%y-%m-%d') = CURDATE() as isSignUp
+            date_format(eus.LAST_SIGN_TIME,'%Y-%m-%d') = CURDATE() as isSignUp
         FROM
             epdc_user eu
         Left Join (select * from  epdc_user_grid_relation  where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserSignDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserSignDao.xml
index 111c9669..41102570 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserSignDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserSignDao.xml
@@ -16,7 +16,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
     <select id="selectUserSignInfoByUserId" resultType="com.elink.esua.epdc.dto.UserSignDTO">
-        select ID,USER_ID,CONSEQUENT_SIGN_DAYS,LAST_SIGN_TIME from epdc_user_sign where DEL_FLAG = '0'
+        select ID,USER_ID,CONSEQUENT_SIGN_DAYS,LAST_SIGN_TIME from epdc_user_sign where DEL_FLAG = '0' and USER_ID = #{userId}
     </select>