wangwei 6 lat temu
rodzic
commit
6d0665b38e

+ 4 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/OrgController.java

@@ -361,8 +361,11 @@ public class OrgController extends ControllerSupport {
 		Specification<OrgEntity> specification = (root, query, cb) -> {
 			List<Predicate> predicates = new ArrayList<>();
 			predicates.add(cb.equal(root.get("rootId"), getRootOrgId()));
+			predicates.add(cb.isNotNull(root.get("parentId")));
 			if (StringUtils.isNotBlank(name)) {
-				predicates.add(cb.like(root.get("name"), toSqlSearchPattern(name)));
+				Predicate pr1 = cb.like(root.get("name"), toSqlSearchPattern(name));
+				Predicate pr2 = cb.like(root.get("code"), toSqlSearchPattern(name));
+				predicates.add(cb.or(pr1, pr2));
 			}
 			if (null != enable) {
 				predicates.add(cb.equal(root.get("enable"), enable));