publish 2.0.11

springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java

@@ -49,6 +49,7 @@ public class CommRoleController {
                     .in("id", list)
                     .eq(CoreRoleServer.IS_DELETED, 0)
                     .eq("is_open", 1)
+                    .orderByAsc("sort")
             );
         }
 

springboot-role/src/main/java/com/tiesheng/role/controller/role/RoleServerController.java

@@ -6,6 +6,7 @@ import com.tiesheng.annotation.role.RoleAuthority;
 import com.tiesheng.role.pojos.dao.CoreRoleAuthority;
 import com.tiesheng.role.pojos.dao.CoreRoleServer;
 import com.tiesheng.role.pojos.dto.MenuListDTO;
+import com.tiesheng.role.pojos.dto.ServerListDTO;
 import com.tiesheng.role.pojos.vo.ServiceMenuVO;
 import com.tiesheng.role.service.CoreRoleService;
 import com.tiesheng.util.pojos.ApiResp;
@@ -29,10 +30,11 @@ public class RoleServerController {
      * @return
      */
     @GetMapping("/server/list")
-    public ApiResp<List<CoreRoleServer>> list() {
+    public ApiResp<List<CoreRoleServer>> list(ServerListDTO dto) {
         return ApiResp.respOK(coreRoleService.getServerMapper().selectList(new QueryWrapper<CoreRoleServer>()
                 .eq(CoreRoleServer.IS_DELETED, 0)
-                .eq("is_open", 1)
+                .eq(StrUtil.isNotEmpty(dto.getIsOpen()), "is_open", dto.getIsOpen())
+                .orderByAsc("sort")
         ));
     }
 

springboot-role/src/main/java/com/tiesheng/role/pojos/dto/ServerListDTO.java

@@ -0,0 +1,15 @@
+package com.tiesheng.role.pojos.dto;
+
+public class ServerListDTO {
+
+    private String isOpen;
+
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+    }
+}