二期 管家小程序

src/main/java/com/care/bms/service/BmsMemberInfoService.java

@@ -45,8 +45,9 @@ public class BmsMemberInfoService {
              */
     public IPage<MemberInfoVO> listCareMemberInfo(UserLogindConvertVO loginUser, String name, String phone, PageReqVO pageReqVo) {
             QueryWrapper<CareDevice> queryWrapper0 = new QueryWrapper<>();
-            queryWrapper0.lambda().eq(loginUser.getStationId()!=null,CareDevice::getStationId,loginUser.getStationId())
-                    .eq(loginUser.getOrgId()!=null,CareDevice::getOrgId,loginUser.getOrgId());
+            queryWrapper0.lambda()
+                    .eq(CareDevice::getOrgId,loginUser.getOrgId())
+                    .eq(loginUser.getStationId()!=null,CareDevice::getStationId,loginUser.getStationId());
             List<CareDevice> careDevices =  this.careDeviceService.list(queryWrapper0);
             List<Long> memberIds = new ArrayList<>();
             if(CollUtil.isNotEmpty(careDevices)){