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

fix bug 40240 用户管理--导出--列表与字段顺序不对

Browse Source 
bug 40243 用户管理--导入--唯一性验证--提示语不对
This commit is contained in:
lijiarao
2021-10-21 15:16:19 +08:00
parent 3917ba9d1b
commit 510fc592bb
2 changed files with 2 additions and 2 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/SysUserController.java
+1 -1
View File
@@ -782,7 +782,7 @@ public class SysUserController {
wrapper.eq(SysUser::getDelFlag,0); wrapper.eq(SysUser::getDelFlag,0);
if (sysUserService.count(wrapper)>0) { if (sysUserService.count(wrapper)>0) {
errorLines++; errorLines++;
errorMessage.add("第 " + lineNumber + " 行：用户名已经存在"); errorMessage.add("第 " + lineNumber + " 行：用户账号已经存在");
} }
LambdaQueryWrapper<SysUser> wrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUser> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SysUser::getPhone,sysUser.getPhone()); wrapper1.eq(SysUser::getPhone,sysUser.getPhone());
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class SysUser implements Serializable {
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", orderNum = "1",format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间",format = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
/** /**