更新

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/DepartmentService.java

@@ -15,4 +15,7 @@ public interface DepartmentService {
     public ResultContent addDepartment(DepartmentParam param);
 
     public ResultContent<List<ITree>> getDepartmentTree(String oid);
+
+    // 删除部门
+    ResultContent deleteDepartment(String id);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/DepartmentController.java

@@ -2,6 +2,7 @@ package com.zhongshu.card.server.core.controller.org;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.OidModel;
 import com.zhongshu.card.client.model.org.DepartmentParam;
 import com.zhongshu.card.client.ret.ResultContent;
@@ -23,7 +24,7 @@ public class DepartmentController {
     private DepartmentService departmentService;
 
     @ResourceAuth(value = "user",type = AuthType.User)
-    @Operation(summary = "添加部门", description = "添加部门")
+    @Operation(summary = "添加-编辑部门", description = "添加-编辑部门")
     @RequestMapping(value = "addDepartment", method = {RequestMethod.POST})
     public ResultContent addDepartment(DepartmentParam param) {
         return this.departmentService.addDepartment(param);
@@ -36,4 +37,11 @@ public class DepartmentController {
         return this.departmentService.getDepartmentTree(param.getOid());
     }
 
+    @ResourceAuth(value = "user",type = AuthType.User)
+    @Operation(summary = "删除部门", description = "删除部门")
+    @RequestMapping(value = "deleteDepartment", method = {RequestMethod.POST})
+    public ResultContent deleteDepartment(IDParam param) {
+        return this.departmentService.deleteDepartment(param.getId());
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/UserInfoController.java

@@ -35,7 +35,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("userInfo")
-@Tag(name = "登录用户相关信息")
+@Tag(name = "登录用户相关")
 public class UserInfoController {
 
     @Autowired

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/DepartmentServiceImpl.java

@@ -50,7 +50,7 @@ public class DepartmentServiceImpl extends SuperService implements DepartmentSer
     @Override
     public ResultContent<Department> addDepartment(DepartmentParam param) {
         if (StringUtils.isEmpty(param.getOid())) {
-            String oid = authHelper.getOrgId();
+            String oid = getCurrentOid();
             param.setOid(oid);
         }
         if (CommonUtil.longIsEmpty(param.getSort())) {
@@ -95,12 +95,17 @@ public class DepartmentServiceImpl extends SuperService implements DepartmentSer
      * @param id
      * @return
      */
+    @Override
     public ResultContent deleteDepartment(String id) {
+        String oid = getCurrentOid();
         Department department = departmentDao.findTopById(id);
         if (ObjectUtils.isEmpty(department)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
         }
-
+        List<Department> childrens = departmentDao.findByParentIdAndOid(id, oid);
+        if(ObjectUtils.isNotEmpty(childrens)) {
+            return ResultContent.buildFail(String.format("%s 有下级部门，不能删除", department.getName()));
+        }
         return ResultContent.buildSuccess();
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -569,7 +569,11 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
 
                 // 添加本地角色信息
                 adminRole = new Role();
-                adminRole.setCode("manager");
+                if (organization.getAuthType().equals(AuthType.Platform)) {
+                    adminRole.setCode(AuthConstant.SuperAdmin);
+                }else {
+                    adminRole.setCode(AuthConstant.Admin);
+                }
                 adminRole.setAuth(auth);
                 adminRole.setOid(oid);
                 adminRole.setRoleGroupId(groupId);