.

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-list.html

@@ -71,7 +71,7 @@
 								<td>{{qualitycheck.wareHouseName}}</td>
                         		<td>
 									<span ng-if="qualitycheck.typeUpdate=='0'">粮食初检</span>
-									<span ng-if="qualitycheck.typeUpdate=='4'">日常检查</span>
+									<span ng-if="qualitycheck.typeUpdate=='4'">春秋普查</span>
 								</td>
 								<td>{{dicData[qualitycheck.quality]}}</td>
 								<td>{{dicData[qualitycheck.subType]}}</td>

src/main/resources/static/app/system/controller/userCtrl.js

@@ -97,9 +97,12 @@ angular.module('app.system').controller("userCtrl",
 angular.module('app.system').controller("userEditCtrl",
     function($scope, $rootScope, $state, $stateParams, $filter, userService, userRoleService, orgService, roleService, FileUploader, APP_CONFIG) {
 		
+		$scope.type = "";
 		if($stateParams.userId == null || $stateParams.userId == ""){//新增的时候默认为库主任
 			$scope.user = {status:"1"};
+			$scope.type = "insert";
 		}else{
+			$scope.type = "update";
 			$("#userPwd").hide();//修改时隐藏密码框
             $scope.user = $rootScope.user;
             $scope.user.rzrq = $filter('date')($rootScope.user.rzrq, "yyyy-MM-dd");
@@ -221,7 +224,9 @@ angular.module('app.system').controller("userEditCtrl",
             });
             var param = {
         		orgId : $rootScope.orgInfo.orgId, 
-				sfzhm : $scope.user.sfzhm
+				sfzhm : $scope.user.sfzhm,
+				userId : $scope.user.userId,
+				type : $scope.type
             };
             $.get(APP_CONFIG.systemUrl + '/userInfo/checkRepeat', param, function(data){
             	if (data == "true") {