Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
 logging:

applications/document/document-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
   redis:

applications/money/money-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
   redis:

applications/money/money-server/src/main/resources/mapper/StatsinfoMapper.xml

@@ -39,9 +39,9 @@
                 #{si_yearmonth,jdbcType=INTEGER},
             </if>
             <if test="si_amount_pay != null" >
-                select sum(pd_amount) from paybalancedet left join paybalance on pd_pbid=pb_id
+                (select sum(pd_amount) from paybalancedet left join paybalance on pd_pbid=pb_id
                 where paybalance.companyId= #{companyid,jdbcType=INTEGER}
-                and pd_ym=#{si_yearmonth,jdbcType=INTEGER} and pb_statuscode='AUDITED',
+                and pd_ym=#{si_yearmonth,jdbcType=INTEGER} and pb_statuscode='AUDITED'),
             </if>
             <if test="si_amount_otherpay != null" >
                 (select sum(os_amount) from othspendings RIGHT JOIN othspendingsdetail on os_id = osd_osid

applications/purchase/purchase-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
 logging:

applications/sale/sale-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
 logging:

applications/storage/storage-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
 logging:

frontend/saas-portal-web/src/components/conenter/home.vue

@@ -88,6 +88,8 @@
               <div class="mask-overly"></div>
               <div class="bg-img slider-1">
                 <img src="/static/img/banner@2x@2x.png" alt="">
+                <!-- <img src="/static/img/banner@3x@2x.png" alt=""> -->
+                <!-- <img src="/static/img/banner.png" alt=""> -->
               </div>
               <!-- 首页内容 -->
               <div class="my-text">
@@ -114,7 +116,7 @@
           <!-- 1 -->
           <div class="ts-box">
             <div class="ts-boximg">
-              <img src="/static/img/feature/mix13x.png" alt="">
+              <img style="margin-left: 18px;" src="/static/img/feature/mix1x.png" alt="">
             </div>
             <div>
               <img class="ts-img" src="/static/img/feature/blue1@2x.png" alt="">
@@ -126,13 +128,13 @@
               <img class="ts-img" src="/static/img/feature/yellow2@2x.png" alt="">
             </div>
             <div class="ts-boximg">
-              <img style="float: right;" src="/static/img/feature/mix23x.png" alt="">
+              <img style="float: right;" src="/static/img/feature/mix2x.png" alt="">
             </div>
           </div>
           <!-- 3 -->
           <div class="ts-box">
             <div class="ts-boximg">
-              <img src="/static/img/feature/mix33x.png" alt="">
+              <img src="/static/img/feature/mix3x.png" alt="">
             </div>
             <div>
               <img class="ts-img" src="/static/img/feature/blue3@2x.png" alt="">
@@ -141,10 +143,10 @@
           <!-- 4 -->
           <div class="ts-box">
             <div>
-              <img class="ts-img" src="/static/img/feature/yellow4@2x.png" alt="">
+              <img style="width:94%" class="ts-img" src="/static/img/feature/yellow4@2x.png" alt="">
             </div>
             <div class="ts-boximg">
-              <img style="float: right;" src="/static/img/feature/mix43x.png" alt="">
+              <img style="float: right;" src="/static/img/feature/mix4x.png" alt="">
             </div>
           </div>
         </div>

frontend/saas-portal-web/static/css/main.css

@@ -337,13 +337,14 @@ main > section {
     /* margin-top: 50px; */
     position: relative;
     padding: 150px 0;
+    width: 98%;
 }
 .ts-boximg {
     position: absolute;
-    top: 40px;
+    top: 50px;
 }
 .ts-boximg img {
-    width: 70%;
+    width: 65%;
 }
 .ts-lefttext p {
     text-align: right;
@@ -362,7 +363,7 @@ main > section {
     float: right;
 }
 .ts-img {
-    width: 96%;
+    width: 98%;
     margin-left: 2%;
 }
 .right-text {

frontend/saas-web/app/Application.scss

@@ -231,9 +231,9 @@ body.launching {
   background: #E5F7FF;
   border-right: 1px solid #ABDAFF;
 
-  &:last-child {
-    border: none;
-  }
+  // &:last-child {
+  //   border: none;
+  // }
 }
 
 .x-column-header-text-inner {

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -229,7 +229,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                         try {
                             var grid = me.items.items[1],
                             columns = grid.columns,
-                            summaryData = data.data.calculate || [];
+                            summaryData = data.data ? (data.data.calculate || []) : [];
     
                             Ext.Array.each(columns, function(c) {
                                 var type = c.summaryType,

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -495,7 +495,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 fieldLabel: '联系电话',
                 name: 'em_mobile',
-                allowBlank:true,
+                allowBlank:false,
                 beforeLabelTextTpl: '',
                 maxLength: 20
             },{