Merge remote-tracking branch 'origin/master'

pom.xml

@@ -9,11 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.45</version>
+    <version>2.3.46</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
-        <docker-image.version>${project.version}</docker-image.version>
     </properties>
 
     <dependencies>
@@ -266,7 +265,7 @@
                                 <image>192.168.0.84:5000/royalpay/manage-dev</image>
                                 <tags>
                                     <tag>latest</tag>
-                                    <tag>${docker-image.version}</tag>
+                                    <tag>${project.version}</tag>
                                 </tags>
                             </to>
                             <extraDirectories>
@@ -301,7 +300,7 @@
                                 <image>hkccr.ccs.tencentyun.com/rpay/serverjre:openj9</image>
                             </from>
                             <to>
-                                <image>hkccr.ccs.tencentyun.com/cross-payment-dev/manage-dev:${docker-image.version}
+                                <image>hkccr.ccs.tencentyun.com/cross-payment-dev/manage-dev:${project.version}
                                 </image>
                             </to>
                             <extraDirectories>
@@ -336,7 +335,7 @@
                                 <image>hkccr.ccs.tencentyun.com/rpay/serverjre:openj9</image>
                             </from>
                             <to>
-                                <image>hkccr.ccs.tencentyun.com/rpay/manage:${docker-image.version}</image>
+                                <image>hkccr.ccs.tencentyun.com/rpay/manage:${project.version}</image>
                             </to>
                             <extraDirectories>
                                 <paths>

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

@@ -1153,8 +1153,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "skip_clearing", false));
             if (client.getIntValue("source") == 4 || client.getIntValue("source") == 5) {
                 List<JSONObject> accounts = clientAccountMapper.listAdminAccounts(client.getIntValue("client_id"));
+                if (accounts == null || accounts.size() <= 0) {
+                    initAdminUserAndSendEmail(manager, clientMoniker, client, false);
+                } else {
                     JSONObject account = accounts.get(0);
                     sendInitEmail(client, account.getString("username"), "*****", false);
+                }
                 // sendInitEmail(manager, client, account.getString("username"), "*****");
                 saveClientAuditProcess(client.getIntValue("client_id"), open_status, 5, "合规通过", manager, 1);
                 clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "skip_clearing", false));

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

@@ -49,14 +49,15 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
             $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/home');
         } else {
             sessionStorage.setItem('roleNum', '1');
-            sessionStorage.setItem('role',getRoleMenulist(window.currentUser.role)[0].value);
+            var roleTemplValue = "guest";
+            if (getRoleMenulist(window.currentUser.role)[0]) {
+                roleTemplValue = getRoleMenulist(window.currentUser.role)[0].value;
+            }
+            sessionStorage.setItem('role', roleTemplValue);
             $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/menu');
         }
 
 
-
-
-
         if (!$httpProvider.defaults.headers.get) {
             $httpProvider.defaults.headers.get = {};
         }