Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx месяцев назад: 9
Родитель
Сommit
b8ddd6f1f9

+ 3 - 2
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -35,7 +35,6 @@ import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPRow;
 import com.itextpdf.text.pdf.PdfPTable;
 import com.itextpdf.text.pdf.PdfWriter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -1522,7 +1521,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                         sb.append("[").append(user.getNickname()).append("]未归集:").append(countAmount.stripTrailingZeros().toPlainString()).append("元,");
                     }
                 }
-                orderList.add(sb.substring(0,sb.length()-1));
+                if (sb.length()>1){
+                    orderList.add(sb.substring(0,sb.length()-1));
+                }
             }
             res.setStrList(orderList);
         }

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -1,6 +1,6 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-kede.version=1.3.41
+kede.version=1.3.40
 static.host=//static.jishutao.com/${kede.version}
 #static.host=//172.16.1.199:3000/${kede.version}
 #static.host=//172.16.1.187/${kede.version}

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
-static.host=//static.jishutao.com/1.3.41
+static.host=//static.jishutao.com/1.3.40
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false