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/api/ComPropertyRepairApi.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
index edd36a1..2003f28 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
@@ -37,6 +37,8 @@
         return this.comPropertyRepairService.pageList(commonPage);
     }
 
+
+
     /**
      * 通过主键查询单条数据
      *
@@ -60,11 +62,14 @@
         if(comPropertyRepairVO!=null){
             BeanUtils.copyProperties(comPropertyRepairVO,comPropertyRepair);
         }
+        ComPropertyRepairVO vo=comPropertyRepairVO;
         try {
             comPropertyRepairVO.setRepairName(RSAUtils.decrypt(comPropertyRepairVO.getRepairName(), Constants.PRIVATE_KEY));
             comPropertyRepairVO.setRepairPhone(RSAUtils.decrypt(comPropertyRepairVO.getRepairPhone(), Constants.PRIVATE_KEY));
         } catch (Exception e) {
             e.printStackTrace();
+            comPropertyRepairVO.setRepairName(vo.getRepairName());
+            comPropertyRepairVO.setRepairPhone(vo.getRepairPhone());
         }
         return R.ok(this.comPropertyRepairService.save(comPropertyRepair));
     }

--
Gitblit v1.7.1