From 0b5136ab6209602e07cae475bda9b5b1747be2ff Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Wed, 16 Aug 2017 14:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=AF=E7=94=A8,=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrganizationalController.java             | 21 +++++++++++++++----
 .../organizational/OrganizationalService.java |  3 +++
 .../simple/SimpleOrganizationalService.java   | 20 ++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

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<O
         organizationalService.updateBatch(batch);
         return ResponseMessage.ok();
     }
+
+    @PutMapping("/{id}/disable")
+    @Authorize(action = Permission.ACTION_DISABLE)
+    @AccessLogger("禁用机构")
+    public ResponseMessage<Boolean> disable(@PathVariable String id) {
+        organizationalService.disable(id);
+        return ResponseMessage.ok();
+    }
+
+    @PutMapping("/{id}/enable")
+    @Authorize(action = Permission.ACTION_ENABLE)
+    @AccessLogger("启用机构")
+    public ResponseMessage<Boolean> 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<OrganizationalEntity, String>
         , CrudService<OrganizationalEntity, String> {
 
+    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<Organiz
         entity.setStatus(DataStatus.STATUS_ENABLED);
         return super.insert(entity);
     }
+
+    @Override
+    public void disable(String id) {
+        Objects.requireNonNull(id);
+        createUpdate()
+                .set(OrganizationalEntity.status, DataStatus.STATUS_DISABLED)
+                .where(OrganizationalEntity.id, id)
+                .exec();
+    }
+
+    @Override
+    public void enable(String id) {
+        Objects.requireNonNull(id);
+        createUpdate()
+                .set(OrganizationalEntity.status, DataStatus.STATUS_ENABLED)
+                .where(OrganizationalEntity.id, id)
+                .exec();
+    }
 }