diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
index aeaf8fb2c..8077354a6 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
@@ -389,6 +389,11 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
         int year = monthCal.get(Calendar.YEAR);
         int month = monthCal.get(Calendar.MONTH) + 1;
 
+        List<JSONObject> list = financialPartnerCommissionMapper.list(year, month);
+        if (list!=null &&list.size() > 0) {
+            throw new ServerErrorException("请不要重复生成合伙人记录");
+        }
+
         financialPartnerCommissionDetailMapper.clearData(year, month, 1);
         financialPartnerCommissionMapper.clearData(year, month, 1);
 
diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html
index 6c5c944dc..b87d465dc 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail.html
@@ -318,6 +318,111 @@
                         </div>
                         <!--<button class="btn btn-success col-sm-offset-2" ng-click="update()"><i class="fa fa-save"></i> Update</button>-->
                     </form>
+                    <div class="box-solid" ng-if="org.type == 0">
+                        <div class="box box-warning">
+                            <div class="box-header">
+                                <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-2">
+                                    <form class="navbar-form navbar-left" role="search">
+                                        <div class="form-group">
+                                            <label class="control-label" for="username-filter-input">Username</label>
+                                            <input type="text" class="form-control" ng-model="params.username" placeholder="Username" id="username-filter-input">
+                                        </div>
+                                        <div class="form-group" ng-if="'1'|withRole">
+                                            <label class="control-label" for="role-filter-select">Role</label>
+                                            <select ng-change="listManagers(1)" class="form-control" id="role-filter-select" ng-model="params.role">
+                                                <option value="1111111">All</option>
+                                                <option value="1">Administrator</option>
+                                                <option value="10">Compliance</option>
+                                                <option value="100">BD User</option>
+                                                <option value="1000">Accountant</option>
+                                                <option value="10000">Service</option>
+                                                <option value="100000">Account Manager</option>
+                                                <option value="1000000">Director</option>
+                                                <option value="10000000">Site Manager</option>
+                                                <option value="100000000">Developer</option>
+                                                <option value="1000000000000">Org Manager</option>
+                                            </select>
+                                        </div>
+                                        <div class="form-group">
+                                            <button class="btn btn-primary" type="button" ng-click="listManagers(1)">
+                                                <i class="fa fa-search"></i> Search
+                                            </button>
+                                        </div>
+
+                                    </form>
+                                    <div class="navbar-form navbar-right">
+                                        <button class="btn btn-success" type="button" ng-click="newManager()">
+                                            <i class="fa fa-plus"></i> New Manager Account
+                                        </button>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                        <div class="box">
+                            <div class="box-body">
+                                <div class="row">
+                                    <div class="col-sm-12 table-responsive">
+                                        <table class="table table-striped table-hover">
+                                            <thead>
+                                            <tr>
+                                                <th>Username</th>
+                                                <th>Display Name</th>
+                                                <th>Wechat</th>
+                                                <th>Create Time</th>
+                                                <th>Email</th>
+                                                <th>Roles</th>
+                                                <th>Operation</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <tr ng-repeat="manager in managers">
+                                                <td ng-bind="manager.username"></td>
+                                                <td ng-bind="manager.display_name"></td>
+                                                <td style="white-space: nowrap;overflow: hidden;text-overflow:ellipsis;"><img ng-src="{{manager.headimg}}" style="height: 30px;width:30px;" class="img-circle" ng-if="manager.headimg"> {{manager.nickname}}</td>
+                                                <td ng-bind="manager.create_time|date:'yyyy-MM-dd'"></td>
+                                                <td ng-bind="manager.email"></td>
+                                                <td>
+                                                    <i class="fa fa-user-secret" title="Administrator" ng-class="{'text-green':manager.admin,'text-gray':!manager.admin}"></i>
+                                                    <i class="fa fa-eye" title="Compliance" ng-class="{'text-green':manager.operator,'text-gray':!manager.operator}"></i>
+                                                    <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':manager.bd,'text-gray':!manager.bd}"></i>
+                                                    <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':manager.finacial,'text-gray':!manager.finacial}"></i>
+                                                    <i class="fa fa-tty" title="Service" ng-class="{'text-green':manager.sevant,'text-gray':!manager.servant}"></i>
+                                                    <i class="fa fa-university" title="Account Manager" ng-class="{'text-green':manager.accountmanager,'text-gray':!manager.accountmanager}"></i>
+                                                    <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':manager.director,'text-gray':!manager.director}"></i>
+                                                    <i class="fa fa-map-o" title="Site Manager" ng-class="{'text-green':manager.sitemanager,'text-gray':!manager.sitemanager}"></i>
+                                                    <i class="fa fa-code" title="Developer" ng-class="{'text-green':manager.developer,'text-gray':!manager.developer}"></i>
+                                                    <i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':manager.orgmanager,'text-gray':!manager.orgmanager}"></i>
+                                                </td>
+                                                <td>
+                                                    <a role="button" class="text-bold text-primary" ng-click="modifyManager(manager)">Modify</a>
+                                                    |
+                                                    <a class="text-bold text-danger" role="button" ng-click="disableManager(manager)">Disable</a>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="box-footer" ng-if="managers.length">
+                                        <uib-pagination class="pagination"
+                                                        total-items="paginationa.totalCount"
+                                                        boundary-links="true"
+                                                        ng-model="paginationa.page"
+                                                        items-per-page="paginationa.limit"
+                                                        max-size="10"
+                                                        ng-change="listManagers()"
+                                                        previous-text="&lsaquo;"
+                                                        next-text="&rsaquo;"
+                                                        first-text="&laquo;"
+                                                        last-text="&raquo;"></uib-pagination>
+                                        <div class="row">
+                                            <div class="col-xs-12">Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </uib-tab>
                 <uib-tab heading="Permission" ng-if="org.type == 0">
                     <form class="form-horizontal margin-top" name="org_permission_form">
@@ -611,7 +716,18 @@
                                     <td ng-bind="clientExtracts.royalpay_charge|currency:'AUD'"></td>
                                     <td ng-bind="clientExtracts.org_charge|currency:'AUD'"></td>
                                     <td ng-bind="clientExtracts.share_charge|currency:'AUD'"></td>
-                                    <td ng-bind="clientExtracts.channel"></td>
+                                    <td>
+                                        <img ng-if='clientExtracts.channel=="Alipay"' src="/static/images/alipay_sign_lg.png"/>
+                                        <img ng-if='clientExtracts.channel=="AlipayOnline"' style="width: 48px;height: 48px" src="/static/images/alipay_online.png"/>
+                                        <img ng-if='clientExtracts.channel=="Wechat"' src="/static/images/wechatpay_sign_lg.png"/>
+                                        <img ng-if='clientExtracts.channel=="Bestpay"' src="/static/images/bestpay_sign_lg.png"/>
+                                        <img ng-if='clientExtracts.channel=="hf"' src="/static/images/hf_sign_lg.png"/>
+                                        <img ng-if='clientExtracts.channel=="jd"' src="/static/images/jd_sign_lg.png"/>
+                                        <img ng-if='clientExtracts.channel=="Yeepay"' src="/static/images/yeepay_sign_lg.png"/>
+                                        <img ng-if='clientExtracts.channel=="Rpay"' src="/static/images/rpayplus_sign_lg.png"/>
+
+                                        {{clientExtracts.channel}}
+                                    </td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -638,109 +754,4 @@
             </uib-tabset>
         </div>
     </div>
-    <div class="box-solid" ng-if="org.type == 0">
-        <div class="box box-warning">
-            <div class="box-header">
-                <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-2">
-                    <form class="navbar-form navbar-left" role="search">
-                        <div class="form-group">
-                            <label class="control-label" for="username-filter-input">Username</label>
-                            <input type="text" class="form-control" ng-model="params.username" placeholder="Username" id="username-filter-input">
-                        </div>
-                        <div class="form-group" ng-if="'1'|withRole">
-                            <label class="control-label" for="role-filter-select">Role</label>
-                            <select ng-change="listManagers(1)" class="form-control" id="role-filter-select" ng-model="params.role">
-                                <option value="1111111">All</option>
-                                <option value="1">Administrator</option>
-                                <option value="10">Compliance</option>
-                                <option value="100">BD User</option>
-                                <option value="1000">Accountant</option>
-                                <option value="10000">Service</option>
-                                <option value="100000">Account Manager</option>
-                                <option value="1000000">Director</option>
-                                <option value="10000000">Site Manager</option>
-                                <option value="100000000">Developer</option>
-                                <option value="1000000000000">Org Manager</option>
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <button class="btn btn-primary" type="button" ng-click="listManagers(1)">
-                                <i class="fa fa-search"></i> Search
-                            </button>
-                        </div>
-
-                    </form>
-                    <div class="navbar-form navbar-right">
-                        <button class="btn btn-success" type="button" ng-click="newManager()">
-                            <i class="fa fa-plus"></i> New Manager Account
-                        </button>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-        <div class="box">
-            <div class="box-body">
-                <div class="row">
-                    <div class="col-sm-12 table-responsive">
-                        <table class="table table-striped table-hover">
-                            <thead>
-                            <tr>
-                                <th>Username</th>
-                                <th>Display Name</th>
-                                <th>Wechat</th>
-                                <th>Create Time</th>
-                                <th>Email</th>
-                                <th>Roles</th>
-                                <th>Operation</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <tr ng-repeat="manager in managers">
-                                <td ng-bind="manager.username"></td>
-                                <td ng-bind="manager.display_name"></td>
-                                <td style="white-space: nowrap;overflow: hidden;text-overflow:ellipsis;"><img ng-src="{{manager.headimg}}" style="height: 30px;width:30px;" class="img-circle" ng-if="manager.headimg"> {{manager.nickname}}</td>
-                                <td ng-bind="manager.create_time|date:'yyyy-MM-dd'"></td>
-                                <td ng-bind="manager.email"></td>
-                                <td>
-                                    <i class="fa fa-user-secret" title="Administrator" ng-class="{'text-green':manager.admin,'text-gray':!manager.admin}"></i>
-                                    <i class="fa fa-eye" title="Compliance" ng-class="{'text-green':manager.operator,'text-gray':!manager.operator}"></i>
-                                    <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':manager.bd,'text-gray':!manager.bd}"></i>
-                                    <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':manager.finacial,'text-gray':!manager.finacial}"></i>
-                                    <i class="fa fa-tty" title="Service" ng-class="{'text-green':manager.sevant,'text-gray':!manager.servant}"></i>
-                                    <i class="fa fa-university" title="Account Manager" ng-class="{'text-green':manager.accountmanager,'text-gray':!manager.accountmanager}"></i>
-                                    <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':manager.director,'text-gray':!manager.director}"></i>
-                                    <i class="fa fa-map-o" title="Site Manager" ng-class="{'text-green':manager.sitemanager,'text-gray':!manager.sitemanager}"></i>
-                                    <i class="fa fa-code" title="Developer" ng-class="{'text-green':manager.developer,'text-gray':!manager.developer}"></i>
-                                    <i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':manager.orgmanager,'text-gray':!manager.orgmanager}"></i>
-                                </td>
-                                <td>
-                                    <a role="button" class="text-bold text-primary" ng-click="modifyManager(manager)">Modify</a>
-                                    |
-                                    <a class="text-bold text-danger" role="button" ng-click="disableManager(manager)">Disable</a>
-                                </td>
-                            </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                    <div class="box-footer" ng-if="managers.length">
-                        <uib-pagination class="pagination"
-                                        total-items="paginationa.totalCount"
-                                        boundary-links="true"
-                                        ng-model="paginationa.page"
-                                        items-per-page="paginationa.limit"
-                                        max-size="10"
-                                        ng-change="listManagers()"
-                                        previous-text="&lsaquo;"
-                                        next-text="&rsaquo;"
-                                        first-text="&laquo;"
-                                        last-text="&raquo;"></uib-pagination>
-                        <div class="row">
-                            <div class="col-xs-12">Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 </section>