Skip to content

M
manager
Commit a3b039fa by manxiaoqiang
Options

pom

parent fad63659
master … 0727_bugfix 1082_bugfix 1151_bugfix 1209_bugfix 1315_bugfix 1439_bugfix 1608_bugfix 1608_from_1619 1619_bugfix 1990_bugfix 20180328_sale 20180411 20180525_adi 20180530_bpu 2578_bugfix 2580_fix 31762_2_bugfix 31762_bugfix 31969_bugfix 32400_fix 32599_bugfix 649_bugfix back_version back_version2 bigfix_20201028 bugfix_1608_new bugfix_1760 bugfix_master_1760 change_double contract_rela develper feature_20180116_new liushaowei manager_new master_mv mobvista_master month_flow
No related merge requests found
Showing with 1 addition and 1 deletion
src/main/java/common/service/impl/UserServiceImpl.java
...@@ -118,7 +118,7 @@ public class UserServiceImpl implements UserService { ...@@ -118,7 +118,7 @@ public class UserServiceImpl implements UserService {
List<User> result = new ArrayList<>(); List<User> result = new ArrayList<>();
if(login.getRole().equals(RoleEnum.MANAGER.getKey())) { if(login.getRole().equals(RoleEnum.MANAGER.getKey())) {
userList = userRepository.findList(); userList = userRepository.findList();
} else if(!RoleTypeEnum.MANAGER.getKey().equals(login.getRoleType())){ } else if(RoleTypeEnum.MANAGER.getKey().equals(login.getRoleType())){
userList = userRepository.findOneDepartment(login.getRole()); userList = userRepository.findOneDepartment(login.getRole());
} }
if(ValidateUtil.isValid(userList)){ if(ValidateUtil.isValid(userList)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment