瀏覽代碼

修改bug

suntianwu 3 年之前
父節點
當前提交
8f85489064

+ 1 - 2
src/main/java/com/care/bms/controller/OrganizationController.java

@@ -71,8 +71,7 @@ public class OrganizationController {
                                                              @RequestParam(value = "systemName", required = false) String systemName,
                                                              PageReqVO pageReqVo){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<OrganizationVO> pageResponse = this.organizationService.listOrganization(name,systemName,loginUser ,pageReqVo);
+            IPage<OrganizationVO> pageResponse = this.organizationService.listOrganization(name,systemName,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("机构列表查询-分页列表出现异常",e);

+ 1 - 1
src/main/java/com/care/bms/service/OrganizationService.java

@@ -92,7 +92,7 @@ public class OrganizationService {
      *
      * @return
      */
-    public IPage<OrganizationVO> listOrganization(String name, String systemName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<OrganizationVO> listOrganization(String name, String systemName,PageReqVO pageReqVo) {
         IPage<CareOrganization> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
         QueryWrapper<CareOrganization> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().like(StrUtil.isNotEmpty(name), CareOrganization::getName, name)

+ 1 - 1
src/main/java/com/care/bms/service/StationService.java

@@ -48,7 +48,7 @@ public class StationService {
         QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareStation::getName,name)
                 .eq(orgId != null,CareStation::getOrgId,orgId)
-                .eq(CareStation::getOrgId,loginUser.getOrgId())
+                .eq(loginUser.getOrgId() != null,CareStation::getOrgId,loginUser.getOrgId())
                 .orderByAsc(CareStation::getName);
 
         IPage<CareStation> pageRes = this.careStationService.page(page, queryWrapper);