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 86c7c9c2..cf60d167 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,13 +568,14 @@ 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.getSuccessAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel); + SuccessAndErrorLines successAndErrorLines = this.saveAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel); successLines = successAndErrorLines.getSuccessLines(); errorLines = successAndErrorLines.getErrorLines(); // 批量将部门和用户信息建立关联关系 TODO 错误需修改 String departIds = sysUserExcel.getDepartIds(); - saveUser(sysUserExcel, departIds); + this.saveUser(sysUserExcel, departIds); } } catch (Exception e) { @@ -601,7 +602,7 @@ public class SysUserController { * @return */ @NotNull - private SuccessAndErrorLines getSuccessAndErrorLines(List errorMessage, int successLines, int errorLines, int i, SysUser sysUserExcel) { + private SuccessAndErrorLines saveAndErrorLines(List errorMessage, int successLines, int errorLines, int i, SysUser sysUserExcel) { SuccessAndErrorLines successAndErrorLines = new SuccessAndErrorLines(); successAndErrorLines.setSuccessLines(successLines); successAndErrorLines.setErrorLines(errorLines); 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 cf805e21..e71a61bf 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.ASSIGN_ID) + @TableId(type = IdType.INPUT) 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 fb81f8f8..ab8ffe16 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,6 +15,7 @@ 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.*; @@ -465,6 +466,7 @@ 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); diff --git a/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java b/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java index f773fe34..0a83200d 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java @@ -20,8 +20,6 @@ public class FindsDepartsChildrenUtil { private FindsDepartsChildrenUtil(){} - - /** * queryTreeList的子方法 ====1===== * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合