修改公式

GeliBusinessPlatform/Define/Define.swift

@@ -129,26 +129,35 @@ func isPurnNumber(str:String)-> Bool{
 //    let expression = "^[0-9]*((\\.|,)[0-9]{0,2})?$"
 
 
-    if str.count > 0 {
-        var predicateStr:String!
-        var currObject:String!
-        predicateStr = "^[0-9]*((\\.|,)[0-9]{0,2})?$"
-        currObject = str
-        let predicate =  NSPredicate(format: "SELF MATCHES %@" ,predicateStr)
-        return predicate.evaluate(with: currObject)
-    }
+    
     let arr = str.components(separatedBy: ",")
     if arr.count > 0 {
         var num = ""
         for item in arr{
             num += item
         }
+        if num.count > 0 {
+            var predicateStr:String!
+            var currObject:String!
+            predicateStr = "^[0-9]*((\\.|,)[0-9]{0,2})?$"
+            currObject = num
+            let predicate =  NSPredicate(format: "SELF MATCHES %@" ,predicateStr)
+            return predicate.evaluate(with: currObject)
+        }
         if isPurnInt(string: num) || isPurnFloat(string: num){
                    return true
                }else{
                    return false
                }
     }else{
+        if str.count > 0 {
+            var predicateStr:String!
+            var currObject:String!
+            predicateStr = "^[0-9]*((\\.|,)[0-9]{0,2})?$"
+            currObject = str
+            let predicate =  NSPredicate(format: "SELF MATCHES %@" ,predicateStr)
+            return predicate.evaluate(with: currObject)
+        }
         if isPurnInt(string: str) || isPurnFloat(string: str){
             return true
         }else{