From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
index 9f99a78..a86b6e3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
@@ -18,6 +18,8 @@
 import javax.annotation.Resource;
 import java.util.List;
 
+import static java.util.Objects.nonNull;
+
 /**
  * (ComPropertyRepair)表服务实现类
  *
@@ -32,8 +34,13 @@
 
     @Override
     public R pageList(CommonPage commonPage) {
-        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
-        return R.ok(list);
+        if (nonNull(commonPage.getPropertyCheck()) && nonNull(commonPage.getPropertyId())){
+            IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList2(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
+            return R.ok(list);
+        }else{
+            IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
+            return R.ok(list);
+        }
     }
 
     @Override
@@ -62,6 +69,12 @@
     }
 
     @Override
+    public R pageListProperty(CommonPage commonPage) {
+        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
+        return R.ok(list);
+    }
+
+    @Override
     public R selectDetail(Long id) {
         ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
         return R.ok(vo);

--
Gitblit v1.7.1