Merge branch 'dev_v5.0.4' of http://git.qmth.com.cn/examcloud-backend/examcloud-core-examwork.git into dev_v5.0.4

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStudentController.java

@@ -311,6 +311,8 @@ public class ExamStudentController extends ControllerSupport {
         ExamPropertyCacheBean isFaceCheckProperty = CacheHelper.getExamProperty(examId, ExamProperties.IS_FACE_CHECK.name());
         boolean isFaceCheck = isFaceCheckProperty != null && StringUtil.isTrue(isFaceCheckProperty.getValue());
 
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(accessUser.getRootOrgId());
+
         List<ExamStudentDomain> examStudents = new ArrayList<>();
         for (ExamStudentEntity cur : page.getContent()) {
             ExamEntity exam = examMaps.get(cur.getExamId());
@@ -354,7 +356,11 @@ public class ExamStudentController extends ControllerSupport {
 
             bean.setExt1(cur.getExt1());
             // 特殊处理：把ext2当作隐私模式下的身份证号
-            bean.setExt2(IdentityNumberHelper.conceal(cur.getRootOrgId(), cur.getIdentityNumber()));
+            bean.setExt2(cur.getIdentityNumber());
+            if(hidden) {
+                bean.setExt2(IdentityNumberHelper.conceal(cur.getIdentityNumber()));
+            }
+
             bean.setExt3(cur.getExt3());
             bean.setExt4(cur.getExt4());
             bean.setExt5(cur.getExt5());