From b1f86f3be248a43b13defef5e99b56732573f1a3 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Fri, 29 Sep 2023 21:54:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=B7=E8=A1=A8ID=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=8CIAM=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=94=A8=E5=B7=A5=E5=8F=B7=E4=BD=9C=E4=B8=BA=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysUserController.java | 2 -- .../src/main/java/com/jero/modules/system/entity/SysUser.java | 2 +- .../jero/modules/system/service/impl/SysUserServiceImpl.java | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index cf60d167..ea10cf50 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -568,7 +568,6 @@ public class SysUserController { String salt = oConvertUtils.randomGen(8); sysUserExcel.setSalt(salt); String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt); - sysUserExcel.setId(UUIDUtils.randomUUID(32)); sysUserExcel.setPassword(passwordEncode); SuccessAndErrorLines successAndErrorLines = this.saveAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel); successLines = successAndErrorLines.getSuccessLines(); @@ -576,7 +575,6 @@ public class SysUserController { // 批量将部门和用户信息建立关联关系 TODO 错误需修改 String departIds = sysUserExcel.getDepartIds(); this.saveUser(sysUserExcel, departIds); - } } catch (Exception e) { errorMessage.add("发生异常：" + e.getMessage()); diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index e71a61bf..cf805e21 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -34,7 +34,7 @@ public class SysUser implements Serializable { /** * id */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_ID) private String id; /** diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index ab8ffe16..fb81f8f8 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -15,7 +15,6 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.SysUserCacheInfo; import com.jero.common.util.PasswordUtil; import com.jero.common.util.UUIDGenerator; -import com.jero.common.util.UUIDUtils; import com.jero.common.util.oConvertUtils; import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.system.entity.*; @@ -466,7 +465,6 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) { - user.setId(UUIDUtils.randomUUID(32)); //step.1 保存用户 // 对手机号、邮箱进行加密处理 this.proceedUserInfoEncrypt(user);