luowei 2 роки тому
батько
коміт
165d2fc3a7

+ 0 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Set;

+ 7 - 3
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.system.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
@@ -260,20 +261,23 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean saveOrUpdateOrg(SysOrg org) {
-
         boolean isOk = false;
         if (org.getId() != null) {
             isOk = this.updateById(org);
         } else {
+            SysOrg sysOrg = sysOrgMapper.selectById(org.getParentId());
+            org.setParentGuid(sysOrg.getGuid());
+            org.setDeleted(0);
+            long id = IdWorker.getId();
+            org.setId(id);
+            org.setPath(sysOrg.getPath()+id+"-");
             isOk = this.save(org);
         }
-
         /*
          * 重置缓存
          */
         this.clearOrgCache();
         this.loadingOrgCache();
-
         return isOk;
     }