From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
index 5d1882a..238e94d 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
@@ -33,7 +33,6 @@
private String wechat;
- private List<Integer> roleIds;
public boolean valid() {
if (ObjectUtils.isEmpty(accountId))
@@ -43,8 +42,7 @@
ObjectUtils.isEmpty(password) &&
ObjectUtils.isEmpty(email) &&
ObjectUtils.isEmpty(mobile) &&
- ObjectUtils.isEmpty(wechat) &&
- null == roleIds
+ ObjectUtils.isEmpty(wechat)
)
return false;
return true;
@@ -52,6 +50,14 @@
public AccountDTO paramValid() {
AccountDTO dto = new AccountDTO();
+ //���������������������������
+ if(!ObjectUtils.isEmpty(userName)){
+ if(!RegexUtils.checkChinese(userName)||userName.contains(" ")){
+ dto.setCode(ResponseCodeEnum.USERNAME_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.USERNAME_INVALID.getMsg());
+ return dto;
+ }
+ }
//���������������������������������
if (!ObjectUtils.isEmpty(mobile)) {
if (!RegexUtils.checkMobile(mobile)) {
@@ -92,4 +98,6 @@
manageAccount.setWechat(wechat);
return manageAccount;
}
+
+
}
--
Gitblit v1.8.0