|
@@ -238,42 +238,14 @@ public class InnerAPIController extends BaseController {
|
|
if(jyUser == null){
|
|
if(jyUser == null){
|
|
throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
|
|
throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
|
|
}
|
|
}
|
|
|
|
+ List<JySceneUserAuth> jySceneUserAuths = jySceneUserAuthService.getByJyUserId(jyUser.getId());
|
|
|
|
+ List<String> numList = jySceneUserAuths.stream().map(JySceneUserAuth::getNum).collect(Collectors.toList());
|
|
|
|
|
|
UserShareParam shareParam = new UserShareParam();
|
|
UserShareParam shareParam = new UserShareParam();
|
|
- shareParam.setJyUserId(Math.toIntExact(jyUser.getUserId()));
|
|
|
|
|
|
+ shareParam.setNumList(numList);
|
|
shareParam.setPageNum(param.getPageNum());
|
|
shareParam.setPageNum(param.getPageNum());
|
|
shareParam.setPageSize(param.getPageSize());
|
|
shareParam.setPageSize(param.getPageSize());
|
|
Page<UserShareSceneVo> page= jyUserShareService.sceneList(shareParam);
|
|
Page<UserShareSceneVo> page= jyUserShareService.sceneList(shareParam);
|
|
- List<String> numList = page.getRecords().stream().map(UserShareSceneVo::getNum).collect(Collectors.toList());
|
|
|
|
- HashMap<String, JySceneAuth> authMap = jySceneAuthService.getByNumList(numList);
|
|
|
|
- HashMap<String, List<JySceneUserAuth>> userSceneAuthMap = jySceneUserAuthService.getByNumList(numList);
|
|
|
|
- HashSet<Integer> userIds = new HashSet<>();
|
|
|
|
- for (String key : userSceneAuthMap.keySet()) {
|
|
|
|
- List<JySceneUserAuth> userAuths = userSceneAuthMap.get(key);
|
|
|
|
- for (JySceneUserAuth userAuth : userAuths) {
|
|
|
|
- userIds.add(userAuth.getJyUserId());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- HashMap<Integer, JyUser> userHashMap = jyUserService.getByIds(new ArrayList<>(userIds));
|
|
|
|
-
|
|
|
|
- for (UserShareSceneVo record : page.getRecords()) {
|
|
|
|
- JySceneAuth jySceneAuth = authMap.get(record.getNum());
|
|
|
|
- if(jySceneAuth != null){
|
|
|
|
- record.setAuthType(jySceneAuth.getAuthType());
|
|
|
|
- List<JySceneUserAuth> userAuths = userSceneAuthMap.get(record.getNum()+"_"+jySceneAuth.getAuthType());
|
|
|
|
- if(userAuths != null && !userAuths.isEmpty()){
|
|
|
|
- for (JySceneUserAuth userAuth : userAuths) {
|
|
|
|
- JyUser jyUser1 = userHashMap.get(userAuth.getJyUserId());
|
|
|
|
- if(jyUser1 != null){
|
|
|
|
- userAuth.setRyId(jyUser1.getRyId());
|
|
|
|
- userAuth.setRyNo(jyUser1.getRyNo());
|
|
|
|
- userAuth.setRyNickName(jyUser1.getRyNickName());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- record.setAuthList(userAuths);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
|
|
return ResultData.ok(PageInfo.PageInfo(page));
|
|
return ResultData.ok(PageInfo.PageInfo(page));
|
|
}
|
|
}
|