lyhzzz 1 месяц назад
Родитель
Сommit
8e5f42bc6f

+ 1 - 26
src/main/java/com/fdkankan/manage/service/impl/FeedbackOptionServiceImpl.java

@@ -46,15 +46,6 @@ public class FeedbackOptionServiceImpl extends ServiceImpl<IFeedbackOptionMapper
         Page<FeedbackOption> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(FeedbackOption::getSysUserId).collect(Collectors.toSet());
         HashMap<Long, SysUser> byIds = sysUserService.getByIds(sysIds);
-        List<JSONArray> aiIds = page.getRecords().stream().map(FeedbackOption::getAiOption).collect(Collectors.toList());
-        HashSet<Integer> ids = new HashSet<>();
-        for (JSONArray aiId : aiIds) {
-            for (Object object : aiId) {
-                ids.add(Integer.valueOf((String) object));
-            }
-        }
-        HashMap<Integer, FeedbackOption> mapByIds = this.getMapByIds(ids);
-        List<FeedbackOption> voList = new ArrayList<>();
 
         for (FeedbackOption record : page.getRecords()) {
             SysUser sysUser = byIds.get(record.getSysUserId());
@@ -63,24 +54,8 @@ public class FeedbackOptionServiceImpl extends ServiceImpl<IFeedbackOptionMapper
                 record.setSysUserName(sysUser.getUserName());
             }
 
-            JSONArray feedbackOptionIds = record.getAiOption();
-            JSONArray newFeedIds = new JSONArray();
-            for (Object feedbackOptionId : feedbackOptionIds) {
-                FeedbackOption feedbackOption = mapByIds.get(Integer.valueOf((String) feedbackOptionId));
-                if(feedbackOption !=null){
-                    newFeedIds.add(feedbackOption.getId());
-                }
-            }
-            FeedbackOption feedbackOption = new FeedbackOption();
-            BeanUtils.copyProperties(record,feedbackOption);
-            feedbackOption.setAiOption(newFeedIds);
-            voList.add(feedbackOption);
-
         }
-        Page<FeedbackOption> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
-        pageVo.setRecords(voList);
-        pageVo.setTotal(page.getTotal());
-        return PageInfo.PageInfo(pageVo);
+        return PageInfo.PageInfo(page);
     }
 
     @Override