fix: app data为空设为null

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AnalysisController.java

@@ -155,28 +155,25 @@ public class AnalysisController {
 
                 examTitleReplyDto.setReplyStatus(analysisService.getReplyStatus(examTitleId, user.getId()));
 
-                /*if (doctor != null) {
-                    *//**
-                     * TODO: 判断权限 CHC PSA
-                     *//*
+                if (doctor != null) {
                     CHCAnalysis analysis =  analysisService.getAnalysisById(analysisRoundExamTitle.getAnalysisId());
                     if (analysis.getType() == 1) {
-                        *//**
+                        /**
                          * CHC 获取考试前两百名
-                         *//*
+                         */
                         if (rankingListService.isRankingInTop200(doctor.getId())) {
                             examTitleReplyDto.setReplyStatus(analysisService.getReplyStatus(examTitleId, user.getId()));
                         }
 
                     } else if (analysis.getType() == 2) {
-                        *//**
+                        /**
                          * PSA 职务职称主任/副主任 院长/副院长 科长/副科长 管理人数100以上
-                         *//*
+                         */
                         if (doctorService.isAuth(doctor.getId())) {
                             examTitleReplyDto.setReplyStatus(analysisService.getReplyStatus(examTitleId, user.getId()));
                         }
                     }
-                }*/
+                }
             }
             builder.setData(examTitleReplyDto);
         } catch (Exception e) {
@@ -241,16 +238,18 @@ public class AnalysisController {
             AnalysisRoundExamTitle analysisRoundExamTitle = analysisService.getAnanlysisRoundExamTitleById(examTitleId);
             ExamTitleDto examTitleDto = analysisService.getExamTitleDtoById(examTitleId);
 
+            ReplyDto replyDto = new ReplyDto();
             if (null != reply) {
-                ReplyDto replyDto = analysisService.getReplyDtoByReply(reply, user != null ? user.getId() : 0);
-
-                examTitleReplyDetailDto.setAnalysisId(analysisRoundExamTitle.getAnalysisId());
-                examTitleReplyDetailDto.setRoundId(analysisRoundExamTitle.getRoundId());
-                examTitleReplyDetailDto.setExamTitle(examTitleDto);
-                examTitleReplyDetailDto.setReply(replyDto);
-
-                builder.setData(examTitleReplyDetailDto);
+                replyDto = analysisService.getReplyDtoByReply(reply, user != null ? user.getId() : 0);
+            } else {
+                replyDto.setContent("");
             }
+            examTitleReplyDetailDto.setAnalysisId(analysisRoundExamTitle.getAnalysisId());
+            examTitleReplyDetailDto.setRoundId(analysisRoundExamTitle.getRoundId());
+            examTitleReplyDetailDto.setExamTitle(examTitleDto);
+            examTitleReplyDetailDto.setReply(replyDto);
+
+            builder.setData(examTitleReplyDetailDto);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -400,22 +399,28 @@ public class AnalysisController {
                                @RequestBody String content,
                                @RequestHeader String token) {
         if (token == null) {
-            return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_NO_TOKEN);
+            PicaResponse picaResponse = ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_NO_TOKEN);
+            picaResponse.setData("");
+            return picaResponse;
         }
 
         PICAUser user = CommonUtils.getUserByToken(redisClient, token);
 
         if (user == null || user.getId().intValue() == 0) {
             System.out.println("reply: user == null, token=" + token);
-            return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
+            PicaResponse picaResponse = ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
+            picaResponse.setData("");
+            return picaResponse;
         }
 
         /**
          * 如果判断检测的数据中有垃圾 直接返回
          */
         PicaResponse response = antiSpamService.processString(content);
-        if (!response.getCode().equals(PicaResultCode.SUCCESS.code()))
+        if (!response.getCode().equals(PicaResultCode.SUCCESS.code())) {
+            response.setData("");
             return response;
+        }
 
         /**
          * 插入数据库
@@ -423,9 +428,13 @@ public class AnalysisController {
         try {
             analysisService.insertReply(examTitleId, content, user.getId());
         } catch (Exception e) {
-            return ReturnUtil.getPicaResponse(PicaResultCode.INTERFACE_INVOKE_EXCEPTION);
+            PicaResponse picaResponse = ReturnUtil.getPicaResponse(PicaResultCode.INTERFACE_INVOKE_EXCEPTION);
+            picaResponse.setData("");
+            return picaResponse;
         }
 
-        return ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS);
+        PicaResponse picaResponse = ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS);
+        picaResponse.setData("");
+        return picaResponse;
     }
 }

server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/AntiSpamServiceImpl.java

@@ -98,13 +98,13 @@ public class AntiSpamServiceImpl implements AntiSpamService {
                 /**
                  * TODO: 可以进一步处理 显示信息被过滤原因
                  */
-                return ReturnUtil.getPicaResponse(PicaResultCode.DATA_IS_WRONG);
+                return ReturnUtil.getPicaResponse(PicaResultCode.DATA_IS_WRONG, "");
             }
 
         } else {
-            return ReturnUtil.getPicaResponse(jObject.get("code").getAsString(), msg);
+            return ReturnUtil.getPicaResponse(jObject.get("code").getAsString(), msg, "");
         }
 
-        return ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS);
+        return ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS, "");
     }
 }

server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/DoctorServiceImpl.java

@@ -22,6 +22,7 @@ public class DoctorServiceImpl implements DoctorService {
 
     @Override
     public boolean isAuth(Integer doctorId) {
-        return doctorMapper.selectAuthByDoctorId(doctorId) > 0;
+        return doctorMapper.selectAuthByDoctorId(doctorId) > 0 ||
+                doctorMapper.selectPatientCountByDoctorId(doctorId) > 100;
     }
 }