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

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

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.EnabledMark;
@@ -93,7 +94,11 @@ public class FaceManagementController {
     @ApiOperation(value = "根据当前用户查询人脸信息")
     @SaCheckPermission("facemanager:detail")
     public RT<FaceManagementVo> detail() {
-        FaceManagement faceManagement = faceManagementService.getOneDeep(Wrappers.lambdaQuery(FaceManagement.class).eq(FaceManagement::getDeleteMark, DeleteMark.NODELETE.getCode()).eq(FaceManagement::getUserId, StpUtil.getLoginIdAsLong()));
+        FaceManagement faceManagement = faceManagementService.getOneDeep(
+                MPJWrappers.<FaceManagement>lambdaJoin()
+                .eq(FaceManagement::getDeleteMark, DeleteMark.NODELETE.getCode())
+                .eq(FaceManagement::getUserId, StpUtil.getLoginIdAsLong())
+        );
         if (faceManagement == null) {
             return RT.error("找不到此数据！");
         }
@@ -103,6 +108,7 @@ public class FaceManagementController {
             MPJLambdaWrapper<TeacherFaceProcess> queryWrapper = new MPJLambdaWrapper<>();
             queryWrapper.eq(TeacherFaceProcess::getUserId, faceManagement.getUserId())
                     .eq(TeacherFaceProcess::getFacePhoto, faceManagement.getFileId())
+                    .eq(TeacherFaceProcess::getDeleteMark, 0)
 //                    .eq(TeacherFaceProcess::getStatus, 1)
             ;
             TeacherFaceProcess teacherFaceProcess = teacherFaceProcessService.getOne(queryWrapper);
@@ -111,6 +117,8 @@ public class FaceManagementController {
                     faceManagement.setVerifyStatus(2);
                 if (teacherFaceProcess.getStatus() == 2)
                     faceManagement.setVerifyStatus(3);
+            }else{
+                return RT.error("找不到此数据！");
             }
         }
 
@@ -119,6 +127,7 @@ public class FaceManagementController {
             MPJLambdaWrapper<StundentFaceProcess> queryWrapper = new MPJLambdaWrapper<>();
             queryWrapper.eq(StundentFaceProcess::getUserId, faceManagement.getUserId())
                     .eq(StundentFaceProcess::getFacePhoto, faceManagement.getFileId())
+                    .eq(TeacherFaceProcess::getDeleteMark, 0)
 //                    .eq(StundentFaceProcess::getStatus, 1)
             ;
             StundentFaceProcess stundentFaceProcess = stundentFaceProcessService.getOne(queryWrapper);
@@ -127,6 +136,8 @@ public class FaceManagementController {
                     faceManagement.setVerifyStatus(2);
                 if (stundentFaceProcess.getStatus() == 2)
                     faceManagement.setVerifyStatus(3);
+            }else{
+                return RT.error("找不到此数据！");
             }
         }
         return RT.ok(BeanUtil.toBean(faceManagement, FaceManagementVo.class));