|
@@ -85,13 +85,15 @@ public class OrgController extends ControllerSupport {
|
|
|
* @param curPage
|
|
|
* @param pageSize
|
|
|
* @param code
|
|
|
+ * @param domainName
|
|
|
* @param name
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation(value = "分页查询顶级机构")
|
|
|
- @GetMapping("/rootOrgPage/{curPage}/{pageSize}")
|
|
|
+ @GetMapping("rootOrgPage/{curPage}/{pageSize}")
|
|
|
public PageInfo<OrgDomain> getRootOrgPage(@PathVariable Integer curPage,
|
|
|
@PathVariable Integer pageSize, @RequestParam(required = false) String code,
|
|
|
+ @RequestParam(required = false) String domainName,
|
|
|
@RequestParam(required = false) String name) {
|
|
|
|
|
|
Pageable pageable = new PageRequest(curPage, pageSize, Sort.Direction.DESC, "updateTime");
|
|
@@ -105,6 +107,9 @@ public class OrgController extends ControllerSupport {
|
|
|
if (StringUtils.isNotEmpty(code)) {
|
|
|
predicates.add(cb.like(root.get("code"), toSqlSearchPattern(code)));
|
|
|
}
|
|
|
+ if (StringUtils.isNotEmpty(domainName)) {
|
|
|
+ predicates.add(cb.like(root.get("domainName"), toSqlSearchPattern(domainName)));
|
|
|
+ }
|
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
|
};
|
|
|
|