优化核心框架

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("个人资料");

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")

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;

src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml

@@ -40,6 +40,12 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.keywords != null">
+              AND (
+              a.tenant_name LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.tenant_id = #{param.keywords}
+              )
+            </if>
         </where>
     </sql>
 

src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java

@@ -23,7 +23,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
     @Override
     public PageResult<Tenant> pageRel(TenantParam param) {
         PageParam<Tenant, TenantParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc");
         List<Tenant> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }