update..

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamScoreController.java

@@ -53,11 +53,15 @@ public class ExamScoreController extends ControllerSupport {
     public Page<ExamScoreInfo> scoreDetails(@RequestBody ExamScoreQuery query) {
         UserDataRules uds = new UserDataRules(getUserDataRule(DataRuleType.ORG), getUserDataRule(DataRuleType.COURSE));
 
-        Page<ExamScoreInfo> examScoreList = examScoreService.getExamScoreList(uds, query);
-        examScoreList.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(getRootOrgId(), p.getIdentityNumber()));
-        });
-        return examScoreList;
+        Page<ExamScoreInfo> page = examScoreService.getExamScoreList(uds, query);
+
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(getRootOrgId());
+        if(hidden) {
+            page.getContent().forEach(p -> {
+                p.setIdentityNumber(IdentityNumberHelper.conceal(p.getIdentityNumber()));
+            });
+        }
+        return page;
     }
 
     @PostMapping("/statistic/list/for/tool")
@@ -68,11 +72,15 @@ public class ExamScoreController extends ControllerSupport {
         userDataRule.setRefIds(new HashSet<>());
         UserDataRules uds = new UserDataRules(userDataRule, userDataRule);
 
-        Page<ExamScoreInfo> examScoreList = examScoreService.getExamScoreList(uds, query);
-        examScoreList.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(getRootOrgId(), p.getIdentityNumber()));
-        });
-        return examScoreList;
+        Page<ExamScoreInfo> page = examScoreService.getExamScoreList(uds, query);
+
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(getRootOrgId());
+        if(hidden) {
+            page.getContent().forEach(p -> {
+                p.setIdentityNumber(IdentityNumberHelper.conceal(p.getIdentityNumber()));
+            });
+        }
+        return page;
     }
 
     @GetMapping("/statistic/list/export/async")

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

@@ -53,12 +53,15 @@ public class ExamStudentController extends ControllerSupport {
         Check.isNull(query, "查询参数不能为空！");
         Check.isNull(query.getExamId(), "考试批次不能为空！");
         UserDataRules uds = new UserDataRules(getUserDataRule(DataRuleType.ORG), getUserDataRule(DataRuleType.COURSE));
-        Page<ExamStudentInfo> examStudentListPage = examStudentService.getExamStudentListPage(uds, query);
+        Page<ExamStudentInfo> page = examStudentService.getExamStudentListPage(uds, query);
 
-        examStudentListPage.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(p.getRootOrgId(), p.getIdentityNumber()));
-        });
-        return examStudentListPage;
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(getRootOrgId());
+        if(hidden) {
+            page.getContent().forEach(p -> {
+                p.setIdentityNumber(IdentityNumberHelper.conceal(p.getIdentityNumber()));
+            });
+        }
+        return page;
     }
 
     @DataRule(type = {DataRuleType.COURSE, DataRuleType.ORG})
@@ -92,11 +95,15 @@ public class ExamStudentController extends ControllerSupport {
         Check.isNull(query.getExamId(), "考试批次不能为空！");
         query.setFinished(0);
         UserDataRules uds = new UserDataRules(getUserDataRule(DataRuleType.ORG), getUserDataRule(DataRuleType.COURSE));
-        Page<ExamStudentInfo> examStudentListPage = examStudentService.getExamStudentListPage(uds, query);
-        examStudentListPage.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(p.getRootOrgId(), p.getIdentityNumber()));
-        });
-        return examStudentListPage;
+        Page<ExamStudentInfo> page = examStudentService.getExamStudentListPage(uds, query);
+
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(getRootOrgId());
+        if(hidden) {
+            page.getContent().forEach(p -> {
+                p.setIdentityNumber(IdentityNumberHelper.conceal(p.getIdentityNumber()));
+            });
+        }
+        return page;
     }
 
     @DataRule(type = {DataRuleType.COURSE, DataRuleType.ORG})
@@ -120,11 +127,15 @@ public class ExamStudentController extends ControllerSupport {
         Check.isNull(query, "查询参数不能为空！");
         Check.isNull(query.getExamId(), "考试批次不能为空！");
         UserDataRules uds = new UserDataRules(getUserDataRule(DataRuleType.ORG), getUserDataRule(DataRuleType.COURSE));
-        Page<ExamStudentInfo> reExamineStudentList = examStudentService.getReExamineStudentList(uds, query);
-        reExamineStudentList.getContent().forEach(p -> {
-            p.setIdentityNumber(IdentityNumberHelper.conceal(p.getRootOrgId(), p.getIdentityNumber()));
-        });
-        return reExamineStudentList;
+        Page<ExamStudentInfo> page = examStudentService.getReExamineStudentList(uds, query);
+
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(getRootOrgId());
+        if(hidden) {
+            page.getContent().forEach(p -> {
+                p.setIdentityNumber(IdentityNumberHelper.conceal(p.getIdentityNumber()));
+            });
+        }
+        return page;
     }
 
     @PostMapping("/reexamine")