需求

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminUserController.java

@@ -150,11 +150,12 @@ public class AdminUserController {
             @ApiParam(value = "状态 true:正常 false:冻结",required = false) @RequestParam(required = false) Boolean status,
             @ApiParam(value = "用户名",required = false) @RequestParam(required = false) String userName,
             @ApiParam(value = "网点id",required = false) @RequestParam(required = false) String websitId,
+            @ApiParam(value = "是否需要网点账号",required = false) @RequestParam(required = false) Boolean isWebsit,
             @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNum,
             @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        IPage<AdminUser> page = adminUserLogic.list(companyWechatId,companyWechatName,roleId,status,userName,pageNum, pageSize,websitId);
+        IPage<AdminUser> page = adminUserLogic.list(isWebsit,companyWechatId,companyWechatName,roleId,status,userName,pageNum, pageSize,websitId);
         return ResponseHelper.success(page);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -568,7 +568,7 @@ public class AdminUserLogic {
      *
      * @return
      */
-    public IPage<AdminUser> list(String companyWechatId, String companyWechatName, String roleId, Boolean status, String userName, Integer pageNum, Integer pageSize,String websitId) {
+    public IPage<AdminUser> list(Boolean isWebsit,String companyWechatId, String companyWechatName, String roleId, Boolean status, String userName, Integer pageNum, Integer pageSize,String websitId) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() != 2) {
@@ -600,6 +600,7 @@ public class AdminUserLogic {
                 .like(StringUtils.isNotBlank(companyWechatName), AdminUser::getCompanyName, companyWechatName)
                 .eq(StringUtils.isNotBlank(roleId), AdminUser::getRoleId, roleId)
                 .eq(status != null, AdminUser::getStatus, status)
+                .eq(isWebsit != null && !isWebsit, AdminUser::getType, 1)
                 .and(StringUtils.isNotBlank(userName), v -> v.like(AdminUser::getUserName, userName)
                         .or()
                         .like(AdminUser::getNickName, userName))