首页 问答 法规部门可看所有未回答问题，其余人可见自己提问未回答，邀请人可见 自己未能回答的问题

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java

@@ -150,6 +150,7 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
     public Set<String>  getAskQuestionsPage(AskQuestionsPage askQuestions) {
         //当前人是法规部门 则返回未被回答的提问信息
         List<String> uId = askQuestionsDao.getUId();
+        if(!uId.isEmpty()) {
             for (String uid : uId) {
                 if (uid.equals(askQuestions.getUserId())) {
                     //查询所有的问 答
@@ -169,25 +170,41 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
                     for (AskQuestions ask : askQuestionsList) {
                         askIdList.add(ask.getId());
                     }
-                //查询出所有的回答
                     return askIdList;
                 }
             }
-        // 不是法规部门 但是被邀请回答
+        }
+        // 不是法规部门 但是被邀请回答 和自己的提问
+        // 当前人的提问
+        Set<String> askIdList = new HashSet<>();
         QueryWrapper<AskQuestions> askQuestionsQueryWrapper = new QueryWrapper<>();
         askQuestionsQueryWrapper.eq("QUESTIONER",askQuestions.getUserId());
         List<AskQuestions> askQuestionsList = baseMapper.selectList(askQuestionsQueryWrapper);
-        Set<String> askIdList = new HashSet<>();
+        // 当前人的提问没有被回答的
-        //所有没有回答的问题
+        if(!askQuestionsList.isEmpty()) {
             for (AskQuestions ask :askQuestionsList) {
+                QueryWrapper<Reply> replyQueryWrapper = new QueryWrapper<>();
+                replyQueryWrapper.eq("ASK_ID",ask.getId());
+                List<Reply> replies = replyDao.selectList(replyQueryWrapper);
+                if(replies.isEmpty()){
                     askIdList.add(ask.getId());
                 }
-        // 邀请当前人回答
+            }
+        }
+        //邀请当前人回答 当前人未回答
         QueryWrapper<AskUser> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("USID",askQuestions.getUserId());
         List<AskUser> askUsers = askUserService.list(objectQueryWrapper);
-        for (AskUser askUser: askUsers){
+        if(!askUsers.isEmpty()){
-            askIdList.add(askUser.getAsdId());
+            for (AskUser ask :askUsers) {
+                QueryWrapper<Reply> replyQueryWrapper = new QueryWrapper<>();
+                replyQueryWrapper.eq("ASK_ID",ask.getAsdId());
+                replyQueryWrapper.eq("ANSWERER",askQuestions.getUserId());
+                List<Reply> replies = replyDao.selectList(replyQueryWrapper);
+                if(replies.isEmpty()){
+                    askIdList.add(ask.getAsdId());
+                }
+            }
         }
         //查询出所有的回答
         return askIdList;