diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index b5fab40..ee71bb1 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -542,7 +542,7 @@ public class MainController extends BaseController {
menu.setParentId(0);
menu.setPath("/system");
menu.setIcon("setting-outlined");
- menu.setSortNumber(10);
+ menu.setSortNumber(999);
menu.setTenantId(tenant.getTenantId());
menuService.save(menu);
Integer parentId = menu.getMenuId();
@@ -832,7 +832,7 @@ public class MainController extends BaseController {
menu.setAuthority("");
menu.setMenuType(0);
menu.setHide(1);
- menu.setSortNumber(99);
+ menu.setSortNumber(999);
menuService.save(menu);
Integer userCenterParentId = menu.getMenuId();
menu.setTitle("个人资料");
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java
index bb067c5..abbc0c8 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java
@@ -44,7 +44,7 @@ public class TenantController extends BaseController {
@Resource
private RoleMenuService roleMenuService;
- @PreAuthorize("hasAuthority('sys:tenant:list')")
+
@OperationLog
@ApiOperation("分页查询租户")
@GetMapping("/page")
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java
index 2edad10..03fde6c 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java
@@ -39,6 +39,9 @@ public class Tenant implements Serializable {
@ApiModelProperty(value = "状态")
private Integer status;
+ @ApiModelProperty(value = "排序号")
+ private Integer sortNumber;
+
@ApiModelProperty(value = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
index 83ba5b2..1c42512 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
@@ -40,6 +40,12 @@
AND a.create_time <= #{param.createTimeEnd}
+
+ AND (
+ a.tenant_name LIKE CONCAT('%', #{param.keywords}, '%')
+ OR a.tenant_id = #{param.keywords}
+ )
+
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
index 99c423e..c3f4a8e 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
@@ -23,7 +23,7 @@ public class TenantServiceImpl extends ServiceImpl impleme
@Override
public PageResult pageRel(TenantParam param) {
PageParam page = new PageParam<>(param);
- //page.setDefaultOrder("create_time desc");
+ page.setDefaultOrder("sort_number asc");
List list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}