From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
index b9ed547..fc7bf59 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -53,9 +53,6 @@
     @Override
     @Transactional
     public R<ComStreetVO> addStreet(ComStreetVO comStreetVO) {
-        String password = comStreetVO.getPassword();
-        String encode = new BCryptPasswordEncoder().encode(password);
-        comStreetVO.setPassword(encode);
         ComStreetDO comStreetDO = new ComStreetDO();
         LambdaQueryWrapper<ComStreetDO> param = new QueryWrapper<ComStreetDO>().lambda();
         param.eq(ComStreetDO::getName, comStreetVO.getName());
@@ -79,6 +76,10 @@
             BeanUtils.copyProperties(comStreetVO, comStreetDO);
             int insert = comStreetDAO.insert(comStreetDO);
             if (insert > 0) {
+                AdministratorsUserVO administratorsUserVO1=new AdministratorsUserVO();
+                administratorsUserVO1.setUserId(Long.parseLong(r.getData().toString()));
+                administratorsUserVO1.setStreetId(comStreetDO.getStreetId());
+                userService.updateStreet(administratorsUserVO1);
                 ComStreetDO comStreetDO1 = comStreetDAO.selectOne(param);
                 BeanUtils.copyProperties(comStreetDO1, comStreetVO);
                 return R.ok(comStreetVO);
@@ -130,10 +131,10 @@
         if (ObjectUtils.isEmpty(comStreetDO)) {
             return R.fail();
         }
-        ComActVO comActVO = new ComActVO();
-        BeanUtils.copyProperties(comStreetDO, comActVO);
-        comActVO.setAreaName(comActDAO.selectAreaName(comActVO.getAreaCode()));
-        return R.ok(comActVO);
+        ComStreetVO comStreetVO = new ComStreetVO();
+        BeanUtils.copyProperties(comStreetDO, comStreetVO);
+        comStreetVO.setAdministrativeRegions(comStreetDAO.retrieveRegions(comStreetVO.getAreaCode().toString()));
+        return R.ok(comStreetVO);
     }
 
     /**

--
Gitblit v1.7.1