From ed380d8f9f48ac37c0411a62643b010ebcefe642 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Thu, 1 Feb 2018 10:37:18 +0800
Subject: [PATCH 1/2] fix~

---
 .../partner/templates/apply_sub_merchant_id.html    | 13 +++++++++----
 .../payment/partner/templates/partner_detail.html   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html
index c5ef569e7..34b94f7d4 100644
--- a/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html
@@ -105,12 +105,17 @@
                                 </div>
                             </div>
 
-                            <div class="form-group">
-                                <label class="control-label col-sm-3" for="office_phone_input">Office Phone</label>
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.office_phone.$invalid && subForm.office_phone.$dirty}">
+                                <label class="control-label col-sm-3" for="office_phone_input">* Office Phone</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_phone"
-                                           type="text" name="office_phone" id="office_phone_input">
+                                           type="tel" name="office_phone" id="office_phone_input" required>
+                                    <div ng-messages="subForm.office_phone.$error" ng-if="subForm.office_phone.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
                                 </div>
+
                             </div>
 
                             <div class="form-group">
@@ -149,7 +154,7 @@
                 <!--</div>-->
                 <!--end 商品二维码-->
                 <div class="btn-group margin-bottom margin-top">
-                    <button ng-disabled="subForm.$dirty&&subForm.$invalid" class="btn btn-success" type="button"
+                    <button class="btn btn-success" type="button"
                             ng-click="saveAppliy(subForm)">Submit
                     </button>
                 </div>
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index f9dcb03a0..855d0ed8b 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -239,7 +239,7 @@
                         <a ui-sref=".product">Product</a>
                     </li>
                     <li ui-sref-active="active" ng-if="('10'|withRole)">
-                        <a ui-sref=".sub_merchant_applicaitons">Sub Merchant Id Applicaitons</a>
+                        <a ui-sref=".sub_merchant_applicaitons">Wechat Merchant Id Applicaitons</a>
                     </li>
                 </ul>
                 <div class="tab-content" ui-view>

From e1dea2cbbcb236482a99f17aee71c5f0ff806386 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Thu, 1 Feb 2018 11:15:25 +0800
Subject: [PATCH 2/2] fix

---
 .../manage/signin/core/impls/ManagerAccountServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
index 002ce7cca..860b292a5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
@@ -116,7 +116,8 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService {
 
     @Override
     public List<JSONObject> listBDLeaders(JSONObject loginManager) {
-        return managerMapper.listByRole(loginManager.getInteger("org_id"), ManagerRole.BD_LEADER.getMask());
+        loginManager.put("mask",ManagerRole.BD_LEADER.getMask());
+        return managerMapper.listByRole(loginManager);
     }
 
     @Override