Kaynağa Gözat

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

anderx 1 yıl önce
ebeveyn
işleme
c2af059d97

+ 5 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1555,7 +1555,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         bo.setActualDuration(out.getActualDuration());
         bo.setFrequency(out.getFrequency());
         bo.setPeopleCount(out.getPeopleCount());
-        String maxString=":应公出" + bo.getMaxDuration() +"小时["+useOyd.getYear()+"年]";
+        String yearStr="";
+        if (useOyd.getYear()>0){
+            yearStr="["+useOyd.getYear()+"年]";
+        }
+        String maxString=":应公出" + bo.getMaxDuration() +"小时"+yearStr;
         String actualString=",超过" + bo.getExceedDuration() + "小时,";
         if (useOyd.getStatus()==1){
             maxString=":不限制公出小时["+useOyd.getYear()+"年]";