二期 管家小程序

src/main/java/com/care/bms/controller/MemberInfoController.java

@@ -49,9 +49,13 @@ public class MemberInfoController {
                                                          PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            IPage<MemberInfoVO> pageResponse = this.bmsMemberInfoService.listCareMemberInfo(loginUser, name,phone,pageReqVo);
+            if(pageResponse != null){
+                return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
+            } else {
+                return null;
+            }
 
-            IPage<MemberInfoVO> pageResponse = this.bmsMemberInfoService.listCareMemberInfo(name,phone,pageReqVo);
-            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("用户列表查询-分页列表出现异常",e);
             return  PageResult.error(e.getMessage());

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

@@ -13,6 +13,7 @@ import com.care.common.util.MyBeanUtils;
 import com.care.common.vo.PageReqVO;
 
 
+import com.care.common.vo.UserLogindConvertVO;
 import com.care.common.vo.memberinfo.MemberInfoVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -42,29 +43,47 @@ public class BmsMemberInfoService {
      * 查询频安宝用户列表
      * @return
              */
-    public IPage<MemberInfoVO> listCareMemberInfo(String name, String phone, PageReqVO pageReqVo) {
-            IPage<CareMemberInfo> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-            QueryWrapper<CareMemberInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareMemberInfo::getName,name)
-                    .like(StrUtil.isNotEmpty(phone),CareMemberInfo::getPhone,phone)
-                    .orderByAsc(CareMemberInfo::getName);
-
-            IPage<CareMemberInfo> pageRes = this.careMemberInfoService.page(page, queryWrapper);
-            IPage<MemberInfoVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-            if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                List<MemberInfoVO> list = new ArrayList<>();
-                pageRes.getRecords().forEach(item -> {
-                    MemberInfoVO  resVO = new MemberInfoVO();
-                    BeanUtils.copyProperties(item,resVO);
-                    //服务设备数量
-                    QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.lambda().eq(CareDevice::getMemberId,resVO.getId());
-                    resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
-                    list.add(resVO);
+    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());
+            List<CareDevice> careDevices =  this.careDeviceService.list(queryWrapper0);
+            List<Long> memberIds = new ArrayList<>();
+            if(CollUtil.isNotEmpty(careDevices)){
+                careDevices.forEach(item ->{
+                    if(item.getMemberId() != null && item.getMemberId() != 0L){
+                        memberIds.add(item.getMemberId());
+                    }
                 });
-                results.setRecords(list);
             }
-            return results;
+            if(CollUtil.isNotEmpty(memberIds)) {
+                IPage<CareMemberInfo> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
+                QueryWrapper<CareMemberInfo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareMemberInfo::getName,name)
+                        .like(StrUtil.isNotEmpty(phone),CareMemberInfo::getPhone,phone)
+                        .in(CareMemberInfo::getId,memberIds)
+                        .orderByAsc(CareMemberInfo::getName);
+
+                IPage<CareMemberInfo> pageRes = this.careMemberInfoService.page(page, queryWrapper);
+                IPage<MemberInfoVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+                if(CollUtil.isNotEmpty(pageRes.getRecords())){
+                    List<MemberInfoVO> list = new ArrayList<>();
+                    pageRes.getRecords().forEach(item -> {
+                        MemberInfoVO  resVO = new MemberInfoVO();
+                        BeanUtils.copyProperties(item,resVO);
+                        //服务设备数量
+                        QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
+                        queryWrapper1.lambda().eq(CareDevice::getMemberId,resVO.getId());
+                        resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
+                        list.add(resVO);
+                    });
+                    results.setRecords(list);
+                }
+                return results;
+            } else {
+                return null;
+            }
+
     }
 
     /**

src/main/java/com/care/client/service/PinanbaoDevAddService.java

@@ -39,25 +39,25 @@ public class PinanbaoDevAddService {
             map.put("isExist",true);
             map.put("isOtherBind",true);
             return map;
-        } else if(careDevice.getMemberId() !=null  && careDevice.getMemberId().equals(memberId) && "1".equals(careDevice.getActiveStatus())) { //已经自己绑定，并且已经激活
+        } else if(memberId.equals(careDevice.getMemberId()) && DeviceActiveStatusEnum.ACTIVE.getValue().equals(careDevice.getActiveStatus())) { //已经自己绑定，并且已经激活
             map.put("isExist",true);
             map.put("isOtherBind",false);
             map.put("isSelfBind",true);
             map.put("isActive",true);
             return map;
-        }  else if(careDevice.getMemberId() !=null  && careDevice.getMemberId().equals(memberId) && "0".equals(careDevice.getActiveStatus())) { //已经自己绑定，并且未激活
+        }  else if(memberId.equals(careDevice.getMemberId()) && DeviceActiveStatusEnum.NOACTIVE.getValue().equals(careDevice.getActiveStatus())) { //已经自己绑定，并且未激活
             map.put("isExist",true);
             map.put("isOtherBind",false);
             map.put("isSelfBind",true);
             map.put("isActive",false);
             return map;
-        }  else if(careDevice.getMemberId() !=null  && careDevice.getMemberId().equals(memberId) && "0".equals(careDevice.getActiveStatus())) { //没绑定，并且未激活
+        }  else if((careDevice.getMemberId() == null  || careDevice.getMemberId() == 0L ) &&  DeviceActiveStatusEnum.NOACTIVE.getValue().equals(careDevice.getActiveStatus())) { //没绑定，并且未激活
             map.put("isExist",true);
             map.put("isOtherBind",false);
             map.put("isSelfBind",false);
             map.put("isActive",false);
             return map;
-        }  else if(careDevice.getMemberId() !=null  && careDevice.getMemberId().equals(memberId) && "0".equals(careDevice.getActiveStatus())) { //没绑定，并且已经激活
+        }  else if((careDevice.getMemberId() == null  || careDevice.getMemberId() == 0L ) &&  DeviceActiveStatusEnum.ACTIVE.getValue().equals(careDevice.getActiveStatus())) { //没绑定，并且已经激活
             map.put("isExist",true);
             map.put("isOtherBind",false);
             map.put("isSelfBind",false);