From 01be7c1601808739d1fa1348f211e7b3b617297c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 14 Dec 2022 17:04:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=94=A8=E6=88=B7=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/SysUserServiceImpl.java | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
index be61a71..77bd321 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
@@ -207,19 +207,18 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {
-        //逻辑删除
-        logicDelete(ids, SysUserEntity.class);
-
-        //角色用户关系，需要保留，不然逻辑删除就变成物理删除了
-
-
-
         SysUserEntity entity = new SysUserEntity();
         SysUserDTO dto = new SysUserDTO();
         entity.setId(ids[0]);
         dto.setId(ids[0]);
         // 社区管理推送
         sendInfo(dto, entity, 2);
+
+
+        //逻辑删除
+        logicDelete(ids, SysUserEntity.class);
+
+        //角色用户关系，需要保留，不然逻辑删除就变成物理删除了
     }
 
     @Override
@@ -401,9 +400,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                         userAddFormDTO.setCreateTime(DateUtils.format(entity.getCreateDate(), DateUtils.DATE_TIME_PATTERN));
                         userAddFormDTO.setOldManageId(entity.getId().toString());
 
-                        log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserAddFormDTO:" + userAddFormDTO);
                         Result<GlobalResultDTO> result = communityManageFeignClient.addManageUser(userAddFormDTO);
-                        log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserAdd   result:" + JSON.toJSONString(result));
                         communityManageHandle(result, dto, entity);
                     }
                 } else if (type == NumConstant.ONE) {
@@ -418,9 +415,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                         userUpdFormDTO.setId(userEntity.getManageId());
                         userUpdFormDTO.setGridId(sysDeptInfoResultDTO.getGridManageId());
 
-                        log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserUpdFormDTO:" + userUpdFormDTO);
                         Result<GlobalResultDTO> result = communityManageFeignClient.updManageUser(userUpdFormDTO);
-                        log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserupd   result:" + JSON.toJSONString(result));
                         communityManageHandle(result, dto, entity);
                     }
                 } else if (type == NumConstant.TWO) {
@@ -428,9 +423,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                     if (userEntity != null && userEntity.getManageId() != null) {
                         ManageUserDelFormDTO userDelFormDTO = new ManageUserDelFormDTO();
                         userDelFormDTO.setId(userEntity.getManageId());
-                        log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDelFormDTO:" + userDelFormDTO);
                         Result<GlobalResultDTO> result = communityManageFeignClient.delManageUser(userDelFormDTO);
-                        log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDel   result:" + JSON.toJSONString(result));
 //                    communityManageHandle(result, dto, entity);
                     }
                 }
@@ -448,7 +441,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
      * @param entity
      */
     private void communityManageHandle(Result<GlobalResultDTO> result, SysUserDTO dto, SysUserEntity entity) {
-        log.info("++++++++++++++++++++++++++++++++++++++++++++进入设置【设置ManageId】");
         if (result.success()) {
             Object resultObject = result.getData().getResult();
             Integer mId = null;
@@ -456,7 +448,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
             if (resultObject != null) {
                 mId = Integer.valueOf(resultObject.toString());
             }
-            log.info("++++++++++++++++++++++++++++++++++++++++++++进入设置【设置ManageId】++++ mId： " + mId);
             SysUserEntity userEntity = baseDao.selectById(entity.getId());
             // 表里没有直接插入
             if (userEntity == null) {