Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/static/js/service.js

@@ -232,7 +232,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(fileName)){
                     fileName='';
                 }
-                if(angular.isUndefined(state)){
+                if(angular.isUndefined(state)||state==''){
                     state=-1;
                 }
                 console.log(fileName,state,date)
@@ -252,7 +252,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(fileName)){
                     fileName='';
                 }
-                if(angular.isUndefined(state)){
+                if(angular.isUndefined(state)||state==''){
                     state=-1;
                 }
                 console.log(fileName,state,currentPage,itemsPerPage,date)

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

@@ -38,6 +38,9 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
                 $scope.paginationConf.totalItems = data;
                 console.log($scope.paginationConf.totalItems)
             })
+            if($scope.paginationConf.currentPage==0){
+                $scope.paginationConf.currentPage=1;
+            }
             HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
                 $scope.analyseLog = data;
                 console.log($scope.analyseLog)

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

@@ -39,7 +39,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
 
         $scope.doPackageQuery=function(){
             var date = $("#datepicker").val();
-            var typeCode = $("#county").val();
+            var cardType = $("#cardType").val();
             var packageType = $("#packageType").val();
             if(angular.isUndefined($scope.uploadNo)){
                 $scope.uploadNo='';
@@ -56,14 +56,11 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             if(angular.isUndefined($scope.sljg)){
                 $scope.sljg='';
             }
-            if(angular.isUndefined(typeCode)){
-                typeCode='';
-            }
             if(angular.isUndefined(packageType)){
                 packageType='';
             }
             HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
-                typeCode,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
+                cardType,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
                     $scope.paginationConf.totalItems=data.total;
                     $scope.simpleCardCount = data.puSum;
                     $scope.postCardCount = data.youSum;

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

@@ -91,6 +91,9 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
                 $scope.paginationConf.totalItems = data.respData.string;
                 console.log($scope.paginationConf.totalItems)
             })
+            if($scope.paginationConf.currentPage==0){
+                $scope.paginationConf.currentPage=1;
+            }
             HttpService.selectPostPackage($scope.fileName,$scope.state,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,$("#datepicker3").val(),function(data){
                 $scope.postPackageData = data.respData;
                 console.log($scope.postPackageData)