|
@@ -412,7 +412,8 @@ public class OrgController extends ControllerSupport {
|
|
@GetMapping("query")
|
|
@GetMapping("query")
|
|
public List<OrgEntity> querySubOrgList(@RequestParam(required = true) String name,
|
|
public List<OrgEntity> querySubOrgList(@RequestParam(required = true) String name,
|
|
@RequestParam(required = false) Long rootOrgId,
|
|
@RequestParam(required = false) Long rootOrgId,
|
|
- @RequestParam(required = false) Boolean enable) {
|
|
|
|
|
|
+ @RequestParam(required = false) Boolean enable,
|
|
|
|
+ @RequestParam(required = false) Boolean returnEmptyWhenNameNull) {
|
|
|
|
|
|
User accessUser = getAccessUser();
|
|
User accessUser = getAccessUser();
|
|
if (null == rootOrgId) {
|
|
if (null == rootOrgId) {
|
|
@@ -423,7 +424,8 @@ public class OrgController extends ControllerSupport {
|
|
|
|
|
|
Long finalRootOrgId = rootOrgId;
|
|
Long finalRootOrgId = rootOrgId;
|
|
|
|
|
|
- if (StringUtils.isBlank(name)) {
|
|
|
|
|
|
+ if (null != returnEmptyWhenNameNull && returnEmptyWhenNameNull
|
|
|
|
+ && StringUtils.isBlank(name)) {
|
|
List<OrgEntity> list = Lists.newArrayList();
|
|
List<OrgEntity> list = Lists.newArrayList();
|
|
return list;
|
|
return list;
|
|
}
|
|
}
|