From 931e45f5f78494c7af4cab75053da49b57f22fbe Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期一, 13 十月 2025 14:31:43 +0800 Subject: [PATCH] 定时自动叫号 与 WMS获取车辆是否在园接口开发 --- server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java index 20e8eda..24784ff 100644 --- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java +++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java @@ -9,11 +9,10 @@ import com.doumee.core.annotation.excel.ExcelImporter; import com.doumee.core.exception.BusinessException; import com.doumee.core.constants.ResponseStatus; -import com.doumee.core.model.LoginUserInfo; +import com.doumee.service.business.third.model.LoginUserInfo; import com.doumee.core.utils.Constants; import com.doumee.core.utils.PwdCheckUtil; import com.doumee.core.utils.Utils; -import com.doumee.dao.system.SystemDepartmentUserMapper; import com.doumee.dao.system.dto.*; import com.doumee.dao.system.dto.UpdatePwdDto; import com.doumee.dao.system.model.*; @@ -29,7 +28,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.Map; @@ -42,9 +40,9 @@ @Autowired private RedisTemplate<String,Object> redisTemplate; @Autowired - private JwtProperties jwtProperties; - @Autowired private SystemUserService systemUserService; + @Autowired + private JwtProperties jwtProperties; @Autowired private SystemUserRoleService systemUserRoleService; @@ -140,7 +138,7 @@ updateUserDto.setId(dto.getId()); updateUserDto.setUpdateUser(dto.getOperaUserId()); updateUserDto.setPassword(Utils.Secure.encryptPassword(dto.getPassword(), systemUser.getSalt())); - updateUserDto.setNeedChangePwd(Constants.ZERO); + updateUserDto.setNeedChangePwd(dto.getNeedChangePwd()); systemUserService.updateById(updateUserDto); } @@ -163,6 +161,16 @@ user = systemUserService.findOne(queryUserDto); if (user != null) { throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+systemUser.getEmpNo()+"銆戝凡瀛樺湪"); + } + } + //楠岃瘉鎵嬫満鍙� + if (StringUtils.isNotBlank(systemUser.getMobile())) { + queryUserDto = new SystemUser(); + queryUserDto.setDeleted(Boolean.FALSE); + queryUserDto.setMobile(systemUser.getMobile()); + user = systemUserService.findOne(queryUserDto); + if (user != null) { + throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+systemUser.getMobile()+"銆戝凡瀛樺湪"); } } // 鐢熸垚瀵嗙爜鐩� @@ -233,6 +241,16 @@ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+systemUser.getEmpNo()+"銆戝凡瀛樺湪"); } } + //楠岃瘉鎵嬫満鍙� + if (StringUtils.isNotBlank(systemUser.getMobile())) { + queryUserDto = new SystemUser(); + queryUserDto.setMobile(systemUser.getMobile()); + queryUserDto.setDeleted(Boolean.FALSE); + user = systemUserService.findOne(queryUserDto); + if (user != null && !user.getId().equals(systemUser.getId())) { + throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+systemUser.getMobile()+"銆戝凡瀛樺湪"); + } + } // 淇敼鐢ㄦ埛 systemUserService.updateById(systemUser); // 璁剧疆閮ㄩ棬 -- Gitblit v1.9.3