From bd7459810a97b40d49f33c9cee5c072e50cc542d Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Mon, 23 Jul 2018 13:52:06 +0800
Subject: [PATCH] update

---
 .../openim/core/impl/CustomerServiceServiceImpl.java      | 8 ++++----
 src/main/ui/static/config/sysconfigs/sysconfigs.js        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java
index ae5ce2b5d..f71e2b19d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java
@@ -67,7 +67,7 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
             account = managerMapper.findDetail(account.getString("manager_id"));
             isPartner = false;
         }
-        String uid = account.getString("username") + (isPartner ? "(" + client.getString("client_moniker") + ")" : "");
+        String uid = account.getString("username") + (isPartner ? "_"+ client.getString("client_moniker"): "");
         JSONObject saveRecord = new JSONObject();
         saveRecord.put("nick", account.getString("display_name"));
         saveRecord.put("password", DigestUtils.md5Hex("uid"));
@@ -97,7 +97,7 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
         }
         OpenimUserVO result = new OpenimUserVO();
         result.setNick(account.getString("display_name"));
-        result.setUserid(account.getString("username") + "(" + client.getString("client_moniker") + ")");
+        result.setUserid(account.getString("username") + "_" + client.getString("client_moniker"));
         return result;
     }
 
@@ -121,8 +121,8 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
         List<JSONObject> result = new ArrayList<>(accounts.size());
         accounts.forEach(p -> {
             JSONObject openimUser = new JSONObject();
-            openimUser.put("userid", p.getString("username") + "(" + p.getString("client_moniker") + ")");
-            openimUser.put("nick", p.getString("username") + "(" + p.getString("client_moniker") + ")");
+            openimUser.put("userid", p.getString("username") + "_" + p.getString("client_moniker"));
+            openimUser.put("nick", p.getString("username") + "_" + p.getString("client_moniker"));
             openimUser.put("headimg", p.getString("wechat_headimg"));
             result.add(openimUser);
         });
diff --git a/src/main/ui/static/config/sysconfigs/sysconfigs.js b/src/main/ui/static/config/sysconfigs/sysconfigs.js
index c61e6b0da..a6f0bcfc9 100644
--- a/src/main/ui/static/config/sysconfigs/sysconfigs.js
+++ b/src/main/ui/static/config/sysconfigs/sysconfigs.js
@@ -75,7 +75,7 @@ define(['angular', 'uiRouter'], function (angular) {
         $scope.loadServants();
         $scope.onoff = function (servant) {
             var param = {onoff:servant.onoff};
-            $http.put('/sys/openim/roles/servant',param).then(function (resp) {
+            $http.put('/sys/openim/servant/onoff',param).then(function (resp) {
             },function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
             });