lyhzzz 1 rok temu
rodzic
commit
4f9510f2ec

+ 3 - 31
src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -238,42 +238,14 @@ public class InnerAPIController extends BaseController {
         if(jyUser == null){
             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();
-        shareParam.setJyUserId(Math.toIntExact(jyUser.getUserId()));
+        shareParam.setNumList(numList);
         shareParam.setPageNum(param.getPageNum());
         shareParam.setPageSize(param.getPageSize());
         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));
     }

+ 4 - 0
src/main/java/com/fdkankan/manage/entity/UserShareParam.java

@@ -3,6 +3,8 @@ package com.fdkankan.manage.entity;
 import com.fdkankan.manage.vo.request.RequestBase;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class UserShareParam extends RequestBase {
 
@@ -12,4 +14,6 @@ public class UserShareParam extends RequestBase {
     private Integer jyUserId;
     private Integer type = 0;   //0我共享的,1共享给我的
     private Long userId;
+
+    private List<String> numList;
 }

+ 6 - 0
src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -40,6 +40,12 @@
         <if test="param.jyUserId != null">
             and s.user_id = #{param.jyUserId}
         </if>
+        <if test="param.numList != null and param.numList.size >0">
+            and s.num in
+            <foreach collection="param.numList" item="num" open="(" separator="," close=")">
+                 #{num}
+            </foreach>
+        </if>
         order by s.create_time desc ,s.id desc
 
     </select>