fix 合规文件为空的商户

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -5549,6 +5549,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             result = uploadAuthFilesForWaitCompliance(account, client.getString("client_moniker"), clientAuthFilesInfo).get(0);
         } catch (Exception e) {
             logger.error("合同制作出现问题：", e);
+            throw new BadRequestException("合同制作出现问题：" + e.getMessage());
         } finally {
             stream.close();
         }

src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java

@@ -176,6 +176,8 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
                             client.put("client_less_file", true);
                         }
                     }
+                }else {
+                    client.put("client_less_file", true);
                 }
             }
             if (client.getInteger("parent_client_id") != null) {
@@ -694,6 +696,16 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
                         result.put(fileKey,fileJson);
                         clientFilesIsLess = true;
                     }
+                }else {
+                    clientFilesIsLess = true;
+                    for (int c = 0; c < FILE_KEYS.length; c++) {
+                        String key = FILE_KEYS[c];
+                        JSONObject fileJson = new JSONObject();
+                        fileJson.put("key", PUT_KEYS[c]);
+                        fileJson.put("name", FILE_NAMES[c]);
+                        fileJson.put("file_write", true);
+                        result.put(key,fileJson);
+                    }
                 }
                 result.put("client_less_file", clientFilesIsLess);
                 if (clientFilesIsLess) {

src/main/ui/static/boot/indexMainApp.js

@@ -55,7 +55,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
 
                         })
                     };
-                    if($scope.currentUser.client.client_less_file && complianceNoticeCount==0)
+                    if($scope.currentUser.client.client_less_file && complianceNoticeCount==0 && $scope.currentUser.role!=3)
                     {
                         $scope.ComplianceToperfect();
                         complianceNoticeCount++;

src/main/ui/static/payment/partner/partner.js

@@ -49,7 +49,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
         }).state('compliance_contract', {
             url: '/compliance/contract',
             templateUrl: '/static/payment/partner/templates/contract_for_compliance.html',
-            controller: 'aggregateFileCtrl',
+            controller: 'aggregateFileCtrl'
         }).state('basic.clearing_config', {
             url: '/clearing_config',
             templateUrl: '/static/payment/partner/templates/client_bankaccounts.html',

src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html

@@ -141,8 +141,8 @@
                     <label class="control-label col-sm-2">* Agreement</label>
                     <div class="col-sm-4">
                         <div class="form-control-static">
-                            <a role="button" class="btn btn-success"  ng-if="file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1"  ui-sref="compliance_contract"  >重新签订合同</a>
-                            <a role="button"  class="btn btn-success"  ng-if="!file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1" ui-sref="compliance_contract" >签订合同</a>
+                            <a role="button" class="btn btn-success"  ng-if="file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1 && file.client_less_file"  ui-sref="compliance_contract"  >重新签订合同</a>
+                            <a role="button"  class="btn btn-success"  ng-if="!file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1 && file.client_less_file" ui-sref="compliance_contract" >签订合同</a>
                             <a ng-if="file.client_agree_file.file_value" role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file.client_agree_file.file_value[0].file_value}}" target="_blank"><i class="fa fa-download"></i></a>
                             <table>
                                 <tbody>

src/main/ui/static/payment/partner/templates/client_partner_detail.html

@@ -53,7 +53,7 @@
                         <a ui-sref=".compliance_files">Compliance files</a>
                     </li>
 
-                    <li ui-sref-active="active" ng-if="currentUser.client.client_less_file">
+                    <li ui-sref-active="active" ng-if="currentUser.client.client_less_file && currentUser.role != 3">
                         <a ui-sref=".compliance_to_perfect">Compliance Files</a>
                     </li>
 

src/main/ui/static/payment/partner/templates/compliance_files_advice.html

@@ -59,7 +59,6 @@
                                 style="font-family: DengXian; font-size: 14px;">1</span><span
                                 style="font-family: DengXian; font-size: 14px;">详询。</span></p>
                         <p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
-                        <p><span style="font-family: DengXian; font-size: 14px;">在此期间给您造成的不便，我们深表歉意，感谢您的理解与支持。</span></p>
                         <p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
                         <p><span style="font-family: DengXian; font-size: 14px;">顺颂商祺</span></p>
                         <p><span style="font-family: DengXian; font-size: 14px;">RoyalPay Customer Service Team</span></p>