From 0aa0bbdfde221a46019f90a245e40d6b57fd251b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 19:09:03 +0800
Subject: [PATCH] 编码规则bug修复
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 5710cfd..c66d5f2 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -162,6 +162,13 @@
}
@Override
+ public List<User> selectAllUser(User user, Long deptId){
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
+ return users;
+ }
+
+ @Override
public IPage<UserVO> selectUserSearch(UserVO user, Query query) {
LambdaQueryWrapper<User> queryWrapper = Wrappers.<User>query().lambda();
String tenantId = AuthUtil.getTenantId();
@@ -206,13 +213,20 @@
@Override
public UserInfo userInfo(String tenantId, String account) {
- User user = baseMapper.getUser(tenantId, account);
+ User user = baseMapper.getUser(tenantId, account,null);
return buildUserInfo(user);
}
@Override
+ public UserInfo userInfo(String tenantId, String account,String name) {
+ User user = baseMapper.getUser(tenantId, account,name);
+ UserInfo userInfo = buildUserInfo(user);
+ return null;
+ }
+
+ @Override
public UserInfo userInfo(String tenantId, String account, UserEnum userEnum) {
- User user = baseMapper.getUser(tenantId, account);
+ User user = baseMapper.getUser(tenantId, account,null);
return buildUserInfo(user, userEnum);
}
@@ -338,6 +352,7 @@
boolean result = RegexUtil.find(regex, newPassword1);
if(!result){
throw new ServiceException("瀵嗙爜涓彧鑳藉瓨鍦ㄣ��"+strategy.getCombinationNames()+"銆戜腑鍖呭惈鐨勫瓧绗︼紒");
+ //throw new ServiceException(resException);
}
//淇敼瀵嗙爜鍚屾椂锛屾敼鍙樼敤鎴蜂俊鎭腑鐨勫瘑鐮佷慨鏀圭姸鎬佸瓧娈�,瀵嗙爜淇敼鏃堕棿
return this.update(Wrappers.<User>update().lambda()
--
Gitblit v1.9.3