From e74648593855bb5a3f7427a18c648987c02cce72 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Sun, 8 Apr 2018 14:16:12 +0800
Subject: [PATCH] update

---
 .../payment/manage/mappers/system/ClientsContractMapper.xml    | 2 +-
 src/main/ui/static/sys/contract.js                             | 3 +++
 src/main/ui/static/sys/templates/contract_sign.html            | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
index 3719df3ad..f42ad89ea 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
@@ -8,7 +8,7 @@
         limit 1
     </select>
     <select id="listWithClientInfo" resultType="com.alibaba.fastjson.JSONObject">
-        select c.client_moniker client_moniker,cc.create_time create_time,cc.confirm_time confirm_time,a.display_name display_name from
+        select c.client_moniker client_moniker, cc.sign_channel sign_channel,cc.create_time create_time,cc.confirm_time confirm_time,a.display_name display_name from
         sys_clients_contract cc left join sys_clients c on c.client_id = cc.client_id
         left join sys_accounts a on a.account_id = cc.sign_account_id
         <where>
diff --git a/src/main/ui/static/sys/contract.js b/src/main/ui/static/sys/contract.js
index 805522d1b..d86d2f869 100644
--- a/src/main/ui/static/sys/contract.js
+++ b/src/main/ui/static/sys/contract.js
@@ -24,6 +24,9 @@ define(['angular'], function (angular) {
         $scope.params = {};
         $scope.getContractAnalysis = function (page) {
             var params = angular.copy($scope.params);
+            if(!params.client_moniker){
+                delete params.client_moniker;
+            }
             params.page = page || $scope.pagination.page || 1;
             $http.get('/manage/common/analysis/contract/list', {params: params}).then(function (resp) {
                 $scope.contract = resp.data.data;
diff --git a/src/main/ui/static/sys/templates/contract_sign.html b/src/main/ui/static/sys/templates/contract_sign.html
index d94f95dd2..f0b462da6 100644
--- a/src/main/ui/static/sys/templates/contract_sign.html
+++ b/src/main/ui/static/sys/templates/contract_sign.html
@@ -40,6 +40,7 @@
                     <th>Create Time</th>
                     <th>Confirm Time</th>
                     <th>Account Name</th>
+                    <th>Sign Channel</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -48,6 +49,7 @@
                     <td ng-bind="contract.create_time|date:'dd/MMM/yyyy'"></td>
                     <td ng-bind="contract.confirm_time|date:'dd/MMM/yyyy'"></td>
                     <td ng-bind="contract.display_name"></td>
+                    <td ng-bind="contract.sign_channel"></td>
                 </tr>
                 </tbody>
             </table>