Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

src/main/resources/static/views/cardProdPackage/cardProdPackage.js

@@ -89,39 +89,39 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             var date = $("#datepicker").val();
             var packageType = $("#packageType").val();
             if(angular.isUndefined($scope.uploadNo)){
-                url = url + 'uploadNo=' + $scope.uploadNo + '&';
-            }else{
                 url = url + 'uploadNo=&';
+            }else{
+                url = url + 'uploadNo=' + $scope.uploadNo + '&';
             }
             if(angular.isUndefined($scope.idCard)){
-                url = url + 'IDCard=' + $scope.idCard + '&';
-            }else{
                 url = url + 'IDCard=&';
+            }else{
+                url = url + 'IDCard=' + $scope.idCard + '&';
             }
             if(angular.isUndefined($scope.oldPackageNo)){
-                url = url + 'oldFile=' + $scope.oldPackageNo + '&';
-            }else{
                 url = url + 'oldFile=&';
+            }else{
+                url = url + 'oldFile=' + $scope.oldPackageNo + '&';
             }
             if(angular.isUndefined($scope.newPackageNo)){
-                url = url + 'newFile=' + $scope.newPackageNo + '&';
-            }else{
                 url = url + 'newFile=&';
+            }else{
+                url = url + 'newFile=' + $scope.newPackageNo + '&';
             }
             if(angular.isUndefined($scope.sljg)){
-                url = url + 'SSXQDM=' + $scope.sljg + '&';
-            }else{
                 url = url + 'SSXQDM=&';
+            }else{
+                url = url + 'SSXQDM=' + $scope.sljg + '&';
             }
             if(angular.isUndefined($scope.typeCode)){
-                url = url + 'cardType=' + $scope.typeCode + '&';
-            }else{
                 url = url + 'cardType=&';
+            }else{
+                url = url + 'cardType=' + $scope.typeCode + '&';
             }
             if(angular.isUndefined(packageType)){
-                url = url + 'state=' + packageType + '&';
-            }else{
                 url = url + 'state=&';
+            }else{
+                url = url + 'state=' + packageType + '&';
             }
             if (date==''){
                 date=$filter("date")(new Date(), "yyyy-MM-dd");