|
@@ -10,16 +10,10 @@ import com.fdkankan.common.util.PasswordUtils;
|
|
|
import com.fdkankan.common.util.SecurityUtil;
|
|
|
import com.fdkankan.manage_jp.common.PageInfo;
|
|
|
import com.fdkankan.manage_jp.common.ResultCode;
|
|
|
-import com.fdkankan.manage_jp.entity.Company;
|
|
|
-import com.fdkankan.manage_jp.entity.Role;
|
|
|
-import com.fdkankan.manage_jp.entity.User;
|
|
|
-import com.fdkankan.manage_jp.entity.UserRole;
|
|
|
+import com.fdkankan.manage_jp.entity.*;
|
|
|
import com.fdkankan.manage_jp.exception.BusinessException;
|
|
|
import com.fdkankan.manage_jp.mapper.IUserMapper;
|
|
|
-import com.fdkankan.manage_jp.service.ICompanyService;
|
|
|
-import com.fdkankan.manage_jp.service.IRoleService;
|
|
|
-import com.fdkankan.manage_jp.service.IUserRoleService;
|
|
|
-import com.fdkankan.manage_jp.service.IUserService;
|
|
|
+import com.fdkankan.manage_jp.service.*;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fdkankan.manage_jp.util.PasswordUtil;
|
|
|
import com.fdkankan.manage_jp.vo.request.LoginParam;
|
|
@@ -59,6 +53,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
IUserRoleService userRoleService;
|
|
|
@Autowired
|
|
|
IRoleService roleService;
|
|
|
+ @Autowired
|
|
|
+ IUserPlatformService userPlatformService;
|
|
|
|
|
|
@Override
|
|
|
public User getByUserName(String managerPhone) {
|
|
@@ -179,6 +175,9 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
}
|
|
|
}
|
|
|
userVos.add(vo);
|
|
|
+
|
|
|
+ List<UserPlatform> userPlatforms = userPlatformService.getByUserId(record.getId());
|
|
|
+ vo.setPlatformIds(userPlatforms.stream().map(UserPlatform::getPlatformId).collect(Collectors.toList()));
|
|
|
}
|
|
|
Page<UserVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
|
|
|
pageVo.setTotal(page.getTotal());
|