update..

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/StudentController.java

@@ -189,44 +189,13 @@ public class StudentController extends ControllerSupport {
                 predicates.add(cb.equal(root.get("orgId"), orgId));
             }
 
-
-            /*Boolean orgStudentData = PrivilegeManager.judge(finalRootOrgId,
-                    accessUser.getRoleList(), OrgStudentData.CODE);
-            Boolean allStudentData = PrivilegeManager.judge(finalRootOrgId,
-                    accessUser.getRoleList(), AllStudentData.CODE);
-            // 学习中心过滤
-            if (isSuperAdmin()) {
-                if (null != orgId) {
-                    predicates.add(cb.equal(root.get("orgId"), orgId));
-                }
-            } else if (allStudentData) {
-                if (null != orgId) {
-                    predicates.add(cb.equal(root.get("orgId"), orgId));
-                }
-            } else {
-                if (orgStudentData) {
-                    if (hasRole(RoleMeta.LC_USER)) {
-                        UserEntity user = GlobalHelper.getEntity(userRepo, accessUser.getUserId(),
-                                UserEntity.class);
-                        if (null != user.getOrgId()) {
-                            predicates.add(cb.equal(root.get("orgId"), user.getOrgId()));
-                        } else {
-                            predicates.add(cb.equal(root.get("orgId"), -1));
-                        }
-                    } else {
-                        predicates.add(cb.equal(root.get("orgId"), -1));
-                    }
-                } else {
-                    predicates.add(cb.equal(root.get("orgId"), -1));
-                }
-            }*/
-
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
         Page<StudentEntity> studentList = studentRepo.findAll(specification, pageable);
         Iterator<StudentEntity> iterator = studentList.iterator();
         List<StudentDomain> studentDomainList = Lists.newArrayList();
+        boolean hidden = IdentityNumberHelper.identityNumbeConceal(finalRootOrgId);
 
         while (iterator.hasNext()) {
             StudentEntity next = iterator.next();
@@ -247,7 +216,11 @@ public class StudentController extends ControllerSupport {
             bean.setStudentCodesStr(StringUtils.join(studentCodeList, "<br />"));
 
             bean.setIdentityNumber(next.getIdentityNumber());
-            bean.setPrivateIdentityNumber(IdentityNumberHelper.conceal(next.getRootOrgId(), next.getIdentityNumber()));
+            bean.setPrivateIdentityNumber(next.getIdentityNumber());
+            if(hidden) {
+                bean.setPrivateIdentityNumber(IdentityNumberHelper.conceal(next.getIdentityNumber()));
+            }
+
             if (StringUtils.isNotBlank(next.getPhotoPath())) {
                 String photoPath = PhotoPathHelper.fixPhotoPath(next.getPhotoPath());
                 bean.setPhotoPath(FssHelper.finalFileUrl(photoPath));