|
@@ -524,8 +524,8 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
}
|
|
|
|
|
|
List<SysUserSync> result = new ArrayList<>();
|
|
|
- result.addAll(userMapper.getAllUser(startTime, null, accountNo, identityType)); // 假设第一个参数是创建时间
|
|
|
- result.addAll(userMapper.getAllUser(null, startTime, accountNo, identityType)); // 假设第二个参数是更新时间
|
|
|
+ result.addAll(userMapper.getAllUser(startTime, null, accountNo, identityType));
|
|
|
+ result.addAll(userMapper.getAllUser(null, startTime, accountNo, identityType));
|
|
|
return result;
|
|
|
}
|
|
|
|
|
@@ -560,7 +560,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
// 初始化admin状态为false
|
|
|
user.setAdmin(false);
|
|
|
|
|
|
- // 设置角色(根据业务逻辑,用户可能只有一个角色)
|
|
|
+ // 设置角色
|
|
|
Optional.ofNullable(user.getRoleId())
|
|
|
.map(roleMap::get)
|
|
|
.ifPresent(role -> {
|