From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 c708c49..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
@@ -1,8 +1,7 @@
package com.moral.api.pojo.form.account;
import com.moral.api.entity.ManageAccount;
-import com.moral.api.pojo.dto.account.AccountInsertDTO;
-import com.moral.api.pojo.dto.account.AccountUpdateDTO;
+import com.moral.api.pojo.dto.account.AccountDTO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
@@ -34,7 +33,6 @@
private String wechat;
- private List<Integer> roleIds;
public boolean valid() {
if (ObjectUtils.isEmpty(accountId))
@@ -44,15 +42,22 @@
ObjectUtils.isEmpty(password) &&
ObjectUtils.isEmpty(email) &&
ObjectUtils.isEmpty(mobile) &&
- ObjectUtils.isEmpty(wechat) &&
- null == roleIds
+ ObjectUtils.isEmpty(wechat)
)
return false;
return true;
}
- public AccountUpdateDTO paramValid() {
- AccountUpdateDTO dto = new AccountUpdateDTO();
+ 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)) {
@@ -93,4 +98,6 @@
manageAccount.setWechat(wechat);
return manageAccount;
}
+
+
}
--
Gitblit v1.8.0