From e3ea16d020ff0904056c4baf90eb07e7a68b094e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Sun, 25 Apr 2021 10:38:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9MP=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=AD=96=E7=95=A5=20NOT=5FNULL=20->=20NOT=5FEMPTY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 4ed20c85..9a0def6d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -198,11 +198,11 @@ mybatis-plus: # NOT_EMPTY 非空判断(只对字符串类型字段,其他类型字段依然为非NULL判断) # DEFAULT 默认的,一般只用于注解里 # NEVER 不加入 SQL - insertStrategy: NOT_NULL + insertStrategy: NOT_EMPTY # 字段验证策略之 update,在 update 的时候的字段验证策略 - updateStrategy: NOT_NULL + updateStrategy: NOT_EMPTY # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件 - selectStrategy: NOT_NULL + selectStrategy: NOT_EMPTY # PageHelper分页插件 pagehelper: From bc182f1392c1899bf66f308d3587455ef1034b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 28 Apr 2021 11:52:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E6=97=A5=E5=BF=97=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/service/impl/SysLogininforServiceImpl.java | 2 ++ .../com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 8acb14f2..f1078638 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.system.service.ISysLogininforService; import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -28,6 +29,7 @@ public class SysLogininforServiceImpl extends ServiceImpl