From f33bea4c400fbaaabec8ffde7a2b1e00d8cdc9bb Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期三, 28 九月 2022 13:22:29 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 f898131..955f90e 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
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
+import com.panzhihua.common.utlis.RSAUtils;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.service.ComPropertyRepairService;
@@ -28,6 +30,12 @@
private ComPropertyRepairDao comPropertyRepairDao;
@Override
public R pageList(CommonPage commonPage) {
+// try {
+// commonPage.setUsername(RSAUtils.decrypt(commonPage.getUsername(), Constants.PRIVATE_KEY));
+// commonPage.setPhone(RSAUtils.decrypt(commonPage.getPhone(), Constants.PRIVATE_KEY));
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
IPage<ComPropertyRepairVO> list=comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()),commonPage);
return R.ok(list);
}
--
Gitblit v1.7.1