Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingFaceServiceImpl.java

@@ -61,10 +61,10 @@ public class MeetingFaceServiceImpl extends AbstractCrudService<MeetingFaceMappe
                         }else {
                             // 失败 人脸被禁用
                             lambdaUpdate().set(MeetingFace::getVefNum,face.getVefNum()+1).eq(MeetingFace::getFid,face.getFid()).update();
-                            faceState1.setMsg(face.getFaceName()+MeetingFaceVO.FORBIDDEN_FACE+"当前人脸被禁用");
+                            faceState1.setMsg("当前人脸被禁用");
                             faceState1.setFaceName(face.getFaceName());
                             faceState1.setUserId(face.getUserId());
-                            faceState1.setCode(MeetingFaceVO.SUCCESS_CODE);
+                            faceState1.setCode(MeetingFaceVO.FORBIDDEN_FACE);
                             // 就算上一张人脸被禁用还得往下执行
                             // 可能当前用户存在多张人脸，
                             if (faceLength == 1){
@@ -77,8 +77,8 @@ public class MeetingFaceServiceImpl extends AbstractCrudService<MeetingFaceMappe
                         if (faceLength == 1){
                             // 判断当前人脸是否被禁用，如被禁用，提示被禁用
                             // 禁用优先级大于 没有检测到人脸
-                            faceState.setMsg(MeetingFaceVO.NOT_FOUND_FACE+"人脸不匹配，请联系管理员");
-                            faceState.setCode(MeetingFaceVO.SUCCESS_CODE);
+                            faceState.setMsg("人脸不匹配，请联系管理员");
+                            faceState.setCode(MeetingFaceVO.NOT_FOUND_FACE);
                             return faceState;
                         }
                         faceLength --;
@@ -92,7 +92,7 @@ public class MeetingFaceServiceImpl extends AbstractCrudService<MeetingFaceMappe
             }
         }
         // 空异常
-        faceState.setMsg(MeetingFaceVO.NULL_ERROR+"人脸不存在，请联系管理员");
+        faceState.setMsg("人脸不存在，请联系管理员");
         faceState.setCode(MeetingFaceVO.NULL_ERROR);
         return faceState;
     }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingRoomServiceImpl.java

@@ -167,7 +167,7 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
         map.put("userName",userName);
         List<MeetingAttendee> list = meetingAttendeeRepository.findMeetingAttendeeList(meetingId,userId,tenantId);
         if(org.springframework.util.CollectionUtils.isEmpty(list)){
-            map.put("msg","没有会议");
+            map.put("msg","您当前没有需要参加的会议");
         }else{
             map.put("msg","验证成功");
         }