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

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/MaxnumberServiceImpl.java

@@ -280,8 +280,16 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
         String rulecode = maxnumbers.getMn_leadcode();
         String mn_rule = maxnumbers.getMn_rule();
         mn_rule = mn_rule == null ? "" : mn_rule.toUpperCase();
-        String date = "YYYYMM".equals(mn_rule) ? DateUtils.format(new Date(), "yyyyMM") :
-                DateUtils.format(new Date(), "yyyyMMdd");
+        String date = null;
+        if ("YYYYMM".equals(mn_rule)) {
+            date = DateUtils.format(new Date(), "yyyyMM");
+        } else if ("YYYYMMDD".equals(mn_rule)) {
+            date =  DateUtils.format(new Date(), "yyyyMMdd");
+        } else {
+            date = "";
+        }
+/*        String date = "YYYYMM".equals(mn_rule) ? DateUtils.format(new Date(), "yyyyMM") :
+                DateUtils.format(new Date(), "yyyyMMdd");*/
         return rulecode += date;
     }