LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 40551 会议详情--新增-是否需要送站选择是后,新出现的三个字段有以下问题

Browse Source
This commit is contained in:
lijiarao
2021-10-13 16:13:56 +08:00
parent 3646345b0b
commit 734168f069
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+3 -3
View File
@@ -417,9 +417,9 @@ public class SysDepartController {
sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
int lineNumber = num +1;
try {
String error = ValidUtil.validateReturnList(sysDepart);
if (StringUtils.isNotBlank(error)){
errorMessage.add("第 " + lineNumber + " 行："+ error);
List<String> errorList = ValidUtil.validateReturnList(sysDepart);
if (!errorList.isEmpty()){
errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.strip(errorList.toString(),"[]"));
}
LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysDepart::getDepartName,sysDepart.getDepartName());
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+3 -3
View File
@@ -762,10 +762,10 @@ public class SysUserController {
sysUser.setDelFlag(0);
sysUser.setStatus(1);
try {
String error = ValidUtil.validateReturnList(sysUser);
if (StringUtils.isNotBlank(error)){
List<String> errorList = ValidUtil.validateReturnList(sysUser);
if (!errorList.isEmpty()){
errorLines++;
errorMessage.add("第 " + lineNumber + " 行："+ error);
errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.strip(errorList.toString(),"[]"));
}
//处理邮箱和手机号的加密
UserUtil.encryptUser(sysUser);