Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java

@@ -98,25 +98,35 @@ public class FaceManagementController {
             return RT.error("找不到此数据！");
         }
         faceManagement.setVerifyStatus(1);
-        if(faceManagement.getUserType()==1) {
+        if (faceManagement.getUserType() == 1) {
             // 查询 teacher_face_process 审核通过
             MPJLambdaWrapper<TeacherFaceProcess> queryWrapper = new MPJLambdaWrapper<>();
             queryWrapper.eq(TeacherFaceProcess::getUserId, faceManagement.getUserId())
                     .eq(TeacherFaceProcess::getFacePhoto, faceManagement.getFileId())
-                    .eq(TeacherFaceProcess::getStatus, 1);
-            if (teacherFaceProcessService.count(queryWrapper) > 0) {
-                faceManagement.setVerifyStatus(2);
+//                    .eq(TeacherFaceProcess::getStatus, 1)
+            ;
+            TeacherFaceProcess teacherFaceProcess = teacherFaceProcessService.getOne(queryWrapper);
+            if (teacherFaceProcess != null) {
+                if (teacherFaceProcess.getStatus() == 1)
+                    faceManagement.setVerifyStatus(2);
+                if (teacherFaceProcess.getStatus() == 2)
+                    faceManagement.setVerifyStatus(3);
             }
         }
 
-        if(faceManagement.getUserType()==2){
+        if (faceManagement.getUserType() == 2) {
             // 查询 teacher_face_process 审核通过
             MPJLambdaWrapper<StundentFaceProcess> queryWrapper = new MPJLambdaWrapper<>();
             queryWrapper.eq(StundentFaceProcess::getUserId, faceManagement.getUserId())
                     .eq(StundentFaceProcess::getFacePhoto, faceManagement.getFileId())
-                    .eq(StundentFaceProcess::getStatus, 1);
-            if (stundentFaceProcessService.count(queryWrapper) > 0) {
-                faceManagement.setVerifyStatus(2);
+//                    .eq(StundentFaceProcess::getStatus, 1)
+            ;
+            StundentFaceProcess stundentFaceProcess = stundentFaceProcessService.getOne(queryWrapper);
+            if (stundentFaceProcess != null) {
+                if (stundentFaceProcess.getStatus() == 1)
+                    faceManagement.setVerifyStatus(2);
+                if (stundentFaceProcess.getStatus() == 2)
+                    faceManagement.setVerifyStatus(3);
             }
         }
         return RT.ok(BeanUtil.toBean(faceManagement, FaceManagementVo.class));

src/main/java/com/xjrsoft/module/personnel/controller/ReservationSchoolController.java

@@ -135,8 +135,8 @@ public class ReservationSchoolController {
                         .leftJoin(ReservationSchoolPeople.class,ReservationSchoolPeople::getReservationSchooId,ReservationSchool::getId)
                         .leftJoin(Department.class,Department::getId,ReservationSchool::getDeptId,ext->ext.selectAs(Department::getName,ReservationSchoolVisitorPageVo::getDeptCn))
                         .leftJoin(XjrUser.class,XjrUser::getId,ReservationSchool::getRespondentUserId,ext->ext.selectAs(XjrUser::getName,ReservationSchoolVisitorPageVo::getRespondentUserCn))
-                        .select(ReservationSchoolPeople.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
                         .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, ReservationSchoolPeople::getGender, ext->ext.selectAs(DictionaryDetail::getName, ReservationSchoolVisitorPageVo::getGender))
+                        .select(ReservationSchoolPeople.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
         );
         PageOutput<ReservationSchoolVisitorPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolVisitorPageVo.class);
         return RT.ok(pageOutput);