diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/src/main/java/org/hswebframework/web/controller/organizational/OrganizationalController.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/src/main/java/org/hswebframework/web/controller/organizational/OrganizationalController.java index bfeed6b7a..facae7845 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/src/main/java/org/hswebframework/web/controller/organizational/OrganizationalController.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/src/main/java/org/hswebframework/web/controller/organizational/OrganizationalController.java @@ -31,10 +31,7 @@ import org.hswebframework.web.entity.organizational.PersonEntity; import org.hswebframework.web.logging.AccessLogger; import org.hswebframework.web.service.organizational.OrganizationalService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -69,4 +66,20 @@ public class OrganizationalController implements SimpleGenericEntityController disable(@PathVariable String id) { + organizationalService.disable(id); + return ResponseMessage.ok(); + } + + @PutMapping("/{id}/enable") + @Authorize(action = Permission.ACTION_ENABLE) + @AccessLogger("启用机构") + public ResponseMessage enable(@PathVariable String id) { + organizationalService.enable(id); + return ResponseMessage.ok(); + } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/src/main/java/org/hswebframework/web/service/organizational/OrganizationalService.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/src/main/java/org/hswebframework/web/service/organizational/OrganizationalService.java index ad0ac2d75..64c9b9db0 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/src/main/java/org/hswebframework/web/service/organizational/OrganizationalService.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/src/main/java/org/hswebframework/web/service/organizational/OrganizationalService.java @@ -31,4 +31,7 @@ public interface OrganizationalService extends TreeService , CrudService { + void disable(String id); + + void enable(String id); } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleOrganizationalService.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleOrganizationalService.java index 3af8b0659..2742ef924 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleOrganizationalService.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleOrganizationalService.java @@ -25,6 +25,8 @@ import org.hswebframework.web.service.organizational.OrganizationalService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Objects; + /** * 默认的服务实现 * @@ -51,4 +53,22 @@ public class SimpleOrganizationalService extends AbstractTreeSortService