Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -66,7 +66,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
         return ObjectRestResponse.succ();
     }
 
-
+    /**
+     * 禁用
+     * @param appUserId
+     * @return
+     */
     @PutMapping("/disable/{appUserId}")
     public ObjectRestResponse disable(@PathVariable("appUserId") Integer appUserId){
         AppUserLogin appUserLogin = new AppUserLogin();
@@ -75,6 +79,12 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
         appUserLoginBiz.disable(appUserLogin);
         return ObjectRestResponse.succ();
     }
+
+    /**
+     * 取消禁用
+     * @param appUserId
+     * @return
+     */
     @PutMapping("/available/{appUserId}")
     public ObjectRestResponse available(@PathVariable("appUserId") Integer appUserId){
         AppUserLogin appUserLogin = new AppUserLogin();

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberLevelController.java

@@ -8,6 +8,8 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.List;
 
@@ -51,4 +53,15 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba
          }
         return null;
     }
+
+    @GetMapping("/Manage/getMembers")
+    public ObjectRestResponse getMembers(){
+        Example exa = Example.builder(BaseUserMemberLevel.class).where(
+                WeekendSqls.<BaseUserMemberLevel>custom()
+                .andEqualTo(BaseUserMemberLevel::getIsdel,0)
+        ).orderByAsc("level").build();
+        List<BaseUserMemberLevel> baseUserMemberLevels = baseBiz.selectByExample(exa);
+       return ObjectRestResponse.succ(baseUserMemberLevels);
+    }
+
 }