From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 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 53aaaa8..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
@@ -46,7 +53,7 @@
         }
         IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
         for (ComPropertyRepairVO record : list.getRecords()) {
-            record.setRepairName(DesensitizedUtil.mobilePhone(record.getRepairPhone()));
+            record.setRepairPhone(DesensitizedUtil.mobilePhone(record.getRepairPhone()));
             record.setRepairName(DesensitizedUtil.chineseName(record.getRepairName()));
             record.setFeedback(DesensitizedUtil.chineseName(record.getFeedback()));
         }
@@ -62,10 +69,20 @@
     }
 
     @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);
     }
 
 
+    public static void main(String[] args) {
+        System.out.println(DesensitizedUtil.mobilePhone("13980594622"));
+    }
+
 }

--
Gitblit v1.7.1