From 002f34a042682e3f9c060bd2c5ed564a7ddf2cd8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 17 十一月 2023 15:09:59 +0800
Subject: [PATCH] 片区增加备注属性
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 5 +++++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java | 1 -
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
index 28aceb8..afcf8ab 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
@@ -6,7 +6,6 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoBa.BaBlock;
-import com.dy.pipIrrGlobal.pojoBa.BaBlock;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java
index 93a465b..2c8e193 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java
@@ -21,12 +21,12 @@
@Schema(description = "鎵嬫満鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "鎵嬫満鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
//@NotNull(message = "鎵嬫満鍙蜂笉鑳戒负绌�") //涓嶈兘涓簄ull浣嗘槸鍙互涓虹┖
- @Length(message = "鎵嬫満鍙峰繀椤粄min}浣�", min = 11, max = 11)
+ //@Length(message = "鎵嬫満鍙峰繀椤粄min}浣�", min = 11, max = 11)
public String phone ;
@Schema(description = "瀵嗙爜", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "瀵嗙爜涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "瀵嗙爜蹇呴』{min}浣�", min = 6, max = 6)
+ @Length(message = "瀵嗙爜蹇呴』{min}浣�", min = 5, max = 6)
public String password ;
@Schema(description = "缁勭粐鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 303ec97..52f85a0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -105,6 +105,11 @@
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ if(!vo.phone.equals("admin")){
+ if(vo.phone.length() != 11){
+ return BaseResponseUtils.buildFail("鎵嬫満鍙蜂笉姝ｇ‘");
+ }
+ }
if(vo.orgTag == null || vo.orgTag.trim().length() == 0){
return BaseResponseUtils.buildFail("鏈�夋嫨缁勭粐鍗曚綅");
}
--
Gitblit v1.8.0