Browse Source

增加转换接口v6

xiewenjie 3 năm trước cách đây
mục cha
commit
a94d8b4834

+ 3 - 3
sxz-application/src/main/java/com.fdkk.sxz/main.java

@@ -199,9 +199,9 @@ public class main {
 
     public static void main(String[] args) {
         System.out.println(DateUtil.parse(DateUtil.today()));
-        boolean between = DateUtil.isIn(DateUtil.parse("2022-06-06 00:00:01"),
-                DateUtil.parse("2022-06-07 00:00:00"),
-                DateUtil.parse("2022-06-09 00:00:00")
+        boolean between = DateUtil.isIn(DateUtil.parse("2022-06-05 18:12:08"),
+                DateUtil.parse("2022-06-08 18:12:12"),
+                DateUtil.parse("2022-06-07 00:00:00")
         );
 
         System.out.println(between);

+ 2 - 2
sxz-core/src/main/java/com/fdkk/sxz/system/controller/SysLoginController.java

@@ -115,9 +115,9 @@ public class SysLoginController extends BaseController {
 
         LoginCheckEntity checkEntity = loginCheckService.findByUserAccount(userAccount);
         if (ObjectUtil.isNotNull(checkEntity)) {
-            if (!DateUtil.isIn(checkEntity.getStartExpirationTime(),
+            if (!DateUtil.isIn(DateUtil.parse(DateUtil.now()), checkEntity.getStartExpirationTime(),
                     checkEntity.getEndExpirationTime()
-                    , DateUtil.parse(DateUtil.now()))) {
+            )) {
                 return error(ResponseConstant.ACCOUNT_EXPIRED);
             }
         }

+ 1 - 1
sxz-core/src/main/java/com/fdkk/sxz/webApi/service/impl/LoginCheckServiceImpl.java

@@ -24,7 +24,7 @@ public class LoginCheckServiceImpl extends BaseServiceImpl<LoginCheckMapper, Log
     public LoginCheckEntity findByUserAccount(String userAccount) {
         LambdaQueryWrapper<LoginCheckEntity> wrapper = Wrappers.lambdaQuery();
         if (ObjectUtil.isNotNull(userAccount) && StrUtil.isNotEmpty(userAccount)) {
-            wrapper.in(LoginCheckEntity::getUserAccount, userAccount);
+            wrapper.eq(LoginCheckEntity::getUserAccount, userAccount);
         }
         return getOne(wrapper);
     }