From c6d20c6e1db82b204cf59e058bc3ba2a9cd84a1e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 24 十月 2023 09:24:17 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java index 530fea1..a3f1165 100644 --- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java +++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java @@ -106,10 +106,15 @@ @Override @Transactional public void create(CreateSystemUserDTO systemUser) { + + if (StringUtils.isBlank(systemUser.getMobile()) || systemUser.getMobile().length() < 6){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍒涘缓鐢ㄦ埛鍙傛暟閿欒"); + } // 楠岃瘉鐢ㄦ埛鍚� SystemUser queryUserDto = new SystemUser(); queryUserDto.setUsername(systemUser.getUsername()); queryUserDto.setDeleted(Constants.ZERO); + queryUserDto.setUsername(systemUser.getMobile()); SystemUser user = systemUserService.findOne(queryUserDto); if (user != null) { throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪"); @@ -128,9 +133,10 @@ // 鐢熸垚瀵嗙爜鐩� String salt = RandomStringUtils.randomAlphabetic(6); // 鐢熸垚瀵嗙爜 - systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt)); + systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getMobile().substring(systemUser.getMobile().length() - 6), salt)); systemUser.setSalt(salt); systemUser.setId(UUID.randomUUID().toString()); + systemUser.setUsername(systemUser.getMobile()); // 鍒涘缓鐢ㄦ埛璁板綍 systemUserService.create(systemUser); // 璁剧疆閮ㄩ棬 @@ -141,7 +147,7 @@ systemDepartmentUser.setOperaUser(systemUser.getCreateUser()); systemDepartmentUser.setOperaTime(new Date()); systemDepartmentUserService.create(systemDepartmentUser); - } + } // 璁剧疆宀椾綅 if (systemUser.getPositionIds() != null && systemUser.getPositionIds().size() > 0) { for (Integer positionId : systemUser.getPositionIds()) { -- Gitblit v1.9.3