|
@@ -11,6 +11,7 @@ import com.diagbot.service.UserRoleService;
|
|
|
import com.diagbot.service.impl.UserRoleServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.DateUtil;
|
|
|
+import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.UserUtils;
|
|
|
import com.diagbot.vo.UserHospitalInfoVO;
|
|
|
import com.diagbot.vo.UserInfoVO;
|
|
@@ -18,6 +19,7 @@ import com.diagbot.vo.UserRoleInfoCancelVO;
|
|
|
import com.diagbot.vo.UserRoleInfoFindVO;
|
|
|
import com.diagbot.vo.UserRoleInfoVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.support.ManagedMap;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
@@ -72,12 +74,22 @@ public class UserRoleFacade extends UserRoleServiceImpl {
|
|
|
IPage<UserRoleInfoFindDTO> dataAllIPage = userRoleService.getUserRoleAlls(userRoleInfoFindVO);
|
|
|
List<UserRoleInfoFindDTO> dataAll = dataAllIPage.getRecords();
|
|
|
List<Long> hospitalId = new ArrayList<>();
|
|
|
+ List<String> modifierid = new ArrayList<>();
|
|
|
for (UserRoleInfoFindDTO data : dataAll) {
|
|
|
hospitalId.add(data.getHospitalId());
|
|
|
+ modifierid.add(data.getModifier());
|
|
|
+ }
|
|
|
+ Map<Long, String> hospitalInfoData = new ManagedMap<>();
|
|
|
+ Map<String, String> userInfoByIds = new ManagedMap<>();
|
|
|
+ if(ListUtil.isNotEmpty(hospitalId)) {
|
|
|
+ hospitalInfoData = hospitalInfoFacade.getHospitalInfoData(hospitalId);
|
|
|
+ }
|
|
|
+ if(ListUtil.isNotEmpty(modifierid)) {
|
|
|
+ userInfoByIds = userFacade.getUserInfoByIds(modifierid);
|
|
|
}
|
|
|
- Map<Long, String> hospitalInfoData = hospitalInfoFacade.getHospitalInfoData(hospitalId);
|
|
|
for (UserRoleInfoFindDTO userData : dataAll) {
|
|
|
userData.setHospitalName(hospitalInfoData.get(userData.getHospitalId()));
|
|
|
+ userData.setModifier(userInfoByIds.get(userData.getModifier()));
|
|
|
}
|
|
|
return dataAllIPage.setRecords(dataAll);
|
|
|
}
|