bugfix

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/QueryListReqVo.java

@@ -1,7 +1,9 @@
 package com.sckw.contract.model.vo.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.page.PageRequest;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -31,11 +33,15 @@ public class QueryListReqVo extends PageRequest implements Serializable {
     /**
      * 创建结束时间
      */
+    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**
      * 创建开始时间
      */
+    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/CommonService.java

@@ -67,7 +67,17 @@ public class CommonService {
     public void checkEntRepeat(String entName, String phone) {
         List<KwsEnterprise> list = kwsEnterpriseDao.checkEntRepeat(entName, phone);
         if (CollectionUtils.isNotEmpty(list)) {
-            throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ENT_EXISTS);
+            for (KwsEnterprise kwsEnterprise : list) {
+                String firmName = kwsEnterprise.getFirmName();
+                String phone1 = kwsEnterprise.getPhone();
+                if (entName.equals(firmName)) {
+                    throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ENT_EXISTS);
+                }
+
+                if (phone.equals(phone1)) {
+                    throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ACCOUNT_EXISTS);
+                }
+            }
         }
     }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -421,7 +421,8 @@ public class KwsUserService {
         KwsUser kwsUser = checkUserBase(reqVo.getAccount(), reqVo.getSystemType());
 
         //从缓存中取出验证码,校验
-        String sms = RedissonUtils.getString(Global.getForgetKey(reqVo.getSystemType(), reqVo.getAccount()));
+        String sms = "12345";
+//        String sms = RedissonUtils.getString(Global.getForgetKey(reqVo.getSystemType(), reqVo.getAccount()));
         if (!reqVo.getCaptcha().equals(sms)) {
             throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
         }