diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiContactTagsController.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiContactTagsController.java
index 3c0af13e..05b7d677 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiContactTagsController.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiContactTagsController.java
@@ -54,6 +54,8 @@ import java.util.List;
 @Api(value = "联系人标签", description = "管理联系人标签")
 public class ApiContactTagsController extends Handler {
     private static final Logger logger = LoggerFactory.getLogger(ApiContactTagsController.class);
+    private static final String TAGTYPE_USER = "user";
+
 
     @Autowired
     private TagRepository tagRes;
@@ -84,7 +86,7 @@ public class ApiContactTagsController extends Handler {
             }
 
             // 获取所有标签
-            List<Tag> all = tagRes.findAll();
+            List<Tag> all = tagRes.findByOrgiAndTagtype(j.get("orgi").getAsString(), TAGTYPE_USER);
             JsonArray data = new JsonArray();
 
             for (Tag t : all) {
diff --git a/contact-center/config/sql/cskefu-MySQL-slim.sql b/contact-center/config/sql/cskefu-MySQL-slim.sql
index 014724e1..be3d2739 100644
--- a/contact-center/config/sql/cskefu-MySQL-slim.sql
+++ b/contact-center/config/sql/cskefu-MySQL-slim.sql
@@ -7941,7 +7941,7 @@ CREATE TABLE `uk_tag` (
 -- ----------------------------
 BEGIN;
 INSERT INTO `uk_tag` VALUES ('2c938088650ce8ee01650d5b9be0057d', '准客户', 'cskefu', '2018-08-06 03:50:32', 0, '4028cac3614cd2f901614cf8be1f0324', 'callout', NULL, '4');
-INSERT INTO `uk_tag` VALUES ('2c938088650ce8ee01650db8de77068f', '咨询客户标签', 'cskefu', '2018-08-06 12:38:57', 0, '4028cac3614cd2f901614cf8be1f0324', 'user', NULL, '1');
+INSERT INTO `uk_tag` VALUES ('2c938088650ce8ee01650db8de77068f', '联系人标签', 'cskefu', '2018-08-06 12:38:57', 0, '4028cac3614cd2f901614cf8be1f0324', 'user', NULL, '1');
 INSERT INTO `uk_tag` VALUES ('2c938088650ce8ee01650db911570699', '工单', 'cskefu', '2018-08-06 05:32:37', 0, '4028cac3614cd2f901614cf8be1f0324', 'workorders', NULL, '1');
 INSERT INTO `uk_tag` VALUES ('2c938088650ce8ee01650db93ff8069f', '呼叫中心服务', 'cskefu', '2018-08-06 05:32:49', 0, '4028cac3614cd2f901614cf8be1f0324', 'ccsummary', NULL, '1');
 INSERT INTO `uk_tag` VALUES ('2c938088650ce8ee01650db9781306a6', '知识库', 'cskefu', '2018-08-06 05:33:03', 0, '4028cac3614cd2f901614cf8be1f0324', 'kbs', NULL, '');