|
@@ -1,6 +1,7 @@
|
|
|
package com.diagbot.facade;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.diagbot.dto.UserRoleInfoFindDTO;
|
|
|
import com.diagbot.entity.User;
|
|
|
import com.diagbot.entity.UserHospital;
|
|
@@ -67,8 +68,9 @@ public class UserRoleFacade extends UserRoleServiceImpl {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- public List<UserRoleInfoFindDTO> getUserRoles(UserRoleInfoFindVO userRoleInfoFindVO) {
|
|
|
- List<UserRoleInfoFindDTO> dataAll = userRoleService.getUserRoleAlls(userRoleInfoFindVO);
|
|
|
+ public IPage<UserRoleInfoFindDTO> getUserRoles(UserRoleInfoFindVO userRoleInfoFindVO) {
|
|
|
+ IPage<UserRoleInfoFindDTO> dataAllIPage = userRoleService.getUserRoleAlls(userRoleInfoFindVO);
|
|
|
+ List<UserRoleInfoFindDTO> dataAll = dataAllIPage.getRecords();
|
|
|
List<Long> hospitalId = new ArrayList<>();
|
|
|
for (UserRoleInfoFindDTO data : dataAll) {
|
|
|
hospitalId.add(data.getHospitalId());
|
|
@@ -77,7 +79,7 @@ public class UserRoleFacade extends UserRoleServiceImpl {
|
|
|
for (UserRoleInfoFindDTO userData : dataAll) {
|
|
|
userData.setHospitalName(hospitalInfoData.get(userData.getHospitalId()));
|
|
|
}
|
|
|
- return dataAll;
|
|
|
+ return dataAllIPage.setRecords(dataAll);
|
|
|
}
|
|
|
|
|
|
/**
|