From 7ab76171ef26d74947e7bae7d06e75d5bb9ebcbd Mon Sep 17 00:00:00 2001
From: Todking <tod.wu@geekforbest.com>
Date: Mon, 6 Dec 2021 15:22:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=20aps=20kyc=20=E9=80=9A=E7=9F=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/apsKYC/web/RestApsKYCController.java     |  6 +++---
 src/main/ui/static/apsKYC/aps_kyc.js                |  6 ++++--
 .../ui/static/apsKYC/templates/cat_aps_notice.html  | 13 +++++++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java b/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java
index fc837744b..27c702b5e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java
@@ -78,11 +78,11 @@ public class RestApsKYCController {
      * 禁用消息
      *
      * @param manager 运营用户
-     * @param id      消息数据
+     * @param item    消息数据
      */
     @ManagerMapping(value = "/notice", method = RequestMethod.PUT, role = {ManagerRole.ADMIN})
-    public void stopApsNotice(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody String id) {
-        apsNoticeService.stopApsNotice(manager, id);
+    public void stopApsNotice(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody JSONObject item) {
+        apsNoticeService.stopApsNotice(manager, item.getString("id"));
     }
 
     /**
diff --git a/src/main/ui/static/apsKYC/aps_kyc.js b/src/main/ui/static/apsKYC/aps_kyc.js
index 0ddae480c..8e2a621c2 100644
--- a/src/main/ui/static/apsKYC/aps_kyc.js
+++ b/src/main/ui/static/apsKYC/aps_kyc.js
@@ -27,8 +27,10 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         }
         that.loadApsNotice(1);
         that.stopNotice = function (id) {
-            $http.put('/aps/kyc/notice', id).then(function () {
-                that.loadApsNotice(null);
+            var item = {};
+            item.id = id;
+            $http.put('/aps/kyc/notice', item).then(function () {
+                that.loadApsNotice();
             });
         };
         that.getNoticeClients = function (title, id, page) {
diff --git a/src/main/ui/static/apsKYC/templates/cat_aps_notice.html b/src/main/ui/static/apsKYC/templates/cat_aps_notice.html
index 88c9d5dfd..6e12fb1f0 100644
--- a/src/main/ui/static/apsKYC/templates/cat_aps_notice.html
+++ b/src/main/ui/static/apsKYC/templates/cat_aps_notice.html
@@ -7,21 +7,26 @@
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label col-sm-2">* 商户编码</label>
-                    <div class="col-xs-10">
-                        <span>{{ noticeDetail.partnerCodes }}</span>
+                    <div class="col-xs-10" style="margin-top: 7px">
+                        <textarea
+                                rows="5"
+                                style="width: 100%;resize:none;"
+                                required
+                                ng-model="noticeDetail.partnerCodes">
+                            </textarea>
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="control-label col-sm-2">* 通知标题</label>
-                    <div class="col-xs-10">
+                    <div class="col-xs-10" style="margin-top: 7px">
                         <span>{{ noticeDetail.title }}</span>
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="control-label col-sm-2">* 通知内容</label>
-                    <div class="col-xs-10">
+                    <div class="col-xs-10" style="margin-top: 7px">
                         <div style="border:1px solid #000000" id="input"></div>
                     </div>
                 </div>