1.取消仓库字典添加用户和单据类型列表的分页

zhairh
x_z 3 years ago
parent e9540c0167
commit b1908c2f4c

@ -7,7 +7,6 @@ import com.glxp.sale.admin.entity.auth.AuthRole;
import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; import com.glxp.sale.admin.entity.auth.AuthRoleAdmin;
import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; import com.glxp.sale.admin.entity.auth.CustomerInfoEntity;
import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.ListPageRequest;
import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.sale.admin.req.auth.AuthAdminSaveRequest; import com.glxp.sale.admin.req.auth.AuthAdminSaveRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
@ -341,15 +340,8 @@ public class AuthAdminController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/admin/auth/admin/hospitalUserList") @PostMapping("/admin/auth/admin/hospitalUserList")
public BaseResponse getHospitalUserList(@RequestBody ListPageRequest pageRequest) { public BaseResponse getHospitalUserList() {
if (null == pageRequest) { List<AuthAdmin> hospitalUserList = authAdminService.getHospitalUserList();
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.success(hospitalUserList);
}
List<AuthAdmin> hospitalUserList = authAdminService.getHospitalUserList(pageRequest);
PageInfo<AuthAdmin> pageInfo = new PageInfo<>(hospitalUserList);
PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setList(pageInfo.getList());
pageSimpleResponse.setTotal(pageInfo.getTotal());
return ResultVOUtils.success(pageSimpleResponse);
} }
} }

@ -2,7 +2,6 @@ package com.glxp.sale.admin.service.auth;
import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.req.ListPageRequest;
import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
import java.util.List; import java.util.List;
@ -34,6 +33,6 @@ public interface AuthAdminService {
* *
* @return * @return
*/ */
List<AuthAdmin> getHospitalUserList(ListPageRequest pageRequest); List<AuthAdmin> getHospitalUserList();
} }

@ -132,11 +132,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
} }
@Override @Override
public List<AuthAdmin> getHospitalUserList(ListPageRequest pageRequest) { public List<AuthAdmin> getHospitalUserList() {
if (pageRequest.getPage() != null) {
int offset = (pageRequest.getPage() - 1) * pageRequest.getLimit();
PageHelper.offsetPage(offset, pageRequest.getLimit());
}
//查询未被禁用的医院用户 //查询未被禁用的医院用户
return authAdminDao.selectHospitalUser(); return authAdminDao.selectHospitalUser();
} }

Loading…
Cancel
Save