添加照片海康下载

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java

@@ -23,10 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.mortals.framework.ap.SysConstains.*;
@@ -82,13 +79,19 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
                 //已反馈
                 //查询我已经回答过的
                 List<Long> feedbackIdList = answerService.find(new FeedbackAnswerQuery().staffId(context.getUser().getCustomerId())).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
-                FeedbackQuery feedbackQuery = new FeedbackQuery();
-                feedbackQuery.setIdList(feedbackIdList);
-
-                Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
-                model.put(PAGEINFO_KEY, result.getPageInfo());
-                model.put(KEY_RESULT_DATA, result.getList());
-                parsePageInfo(model, result.getPageInfo());
+               if(ObjectUtils.isEmpty(feedbackIdList)){
+                   pageAllInfo.setTotalResult(0);
+                   model.put(PAGEINFO_KEY, pageAllInfo);
+                   model.put(KEY_RESULT_DATA, new ArrayList<>());
+                   parsePageInfo(model, pageAllInfo);
+               }else{
+                   FeedbackQuery feedbackQuery = new FeedbackQuery();
+                   feedbackQuery.setIdList(feedbackIdList);
+                   Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
+                   model.put(PAGEINFO_KEY, result.getPageInfo());
+                   model.put(KEY_RESULT_DATA, result.getList());
+                   parsePageInfo(model, result.getPageInfo());
+               }
             } else {
                 //未反馈
                 //查询我的反馈 但是还未回答的