TRX 1 سال پیش
والد
کامیت
9a8f4d5050

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationController.java

@@ -33,7 +33,7 @@ public class OrganizationController {
     @ResourceAuth(value = "saveProjectInfo", type = AuthType.Platform, remark = "园区项目管理_保存项目_11_Button")
     @ResourceAuth(value = "user", type = AuthType.User)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
-    @Operation(summary = "项目-保存", description = "项目-保存")
+    @Operation(summary = "项目-保存添加项目", description = "项目-保存")
     @RequestMapping(value = "saveProjectInfo", method = {RequestMethod.POST})
     public ResultContent saveProjectInfo(@RequestBody @Valid ProjectSaveParam param) {
         param.setAuthType(AuthType.Project);

+ 2 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/OrganizationUserDao.java

@@ -64,4 +64,6 @@ public interface OrganizationUserDao extends MongoDao<OrganizationUser>, Organiz
     long countByOrganization(Organization organization);
 
     void deleteByOrganization(Organization organization);
+
+    void deleteByProjectOid(String projectOid);
 }

+ 10 - 4
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -596,22 +596,28 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         return ResultContent.buildSuccess(model);
     }
 
+    /**
+     * 删除项目
+     * @param projectOid
+     * @return
+     */
     @Override
     public ResultContent deleteProject(String projectOid) {
-        Organization organization = organizationDao.findTopByOid(projectOid);
-        if (ObjectUtils.isEmpty(organization)) {
+        Organization projectInfo = organizationDao.findTopByOid(projectOid);
+        if (ObjectUtils.isEmpty(projectInfo)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, projectOid));
         }
 
         // 判断项目是否可以删除
         long count = projectBindOrgServiceImpl.countProjectBindNumber(projectOid);
         if (count > 0) {
-            return ResultContent.buildFail(String.format("%s 项目下包含机构,不能删除", organization.getName()));
+            return ResultContent.buildFail(String.format("%s 项目下包含机构,不能删除", projectInfo.getName()));
         }
         // 删除项目信息
-        organizationDao.delete(organization);
+        organizationDao.delete(projectInfo);
 
         // 删除项目关联的信息
+        organizationUserDao.deleteByProjectOid(projectOid);
 
         return ResultContent.buildSuccess();
     }