| 
					
				 | 
			
			
				@@ -590,7 +590,7 @@ public class UserLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (examineStatus.equals(ExamineStatusEnum.OK.getKey())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (StringUtils.isNotBlank(user.getWorkerNumber()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     && !StringUtils.equals(user.getWorkerNumber(), websitUser.getWorkerNumber())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                throw new RemoteServiceException("用户师傅编号" + user.getWorkerNumber() + "与本次传入师傅编号" + websitUser.getWorkerNumber() + "不一致"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                throw new RemoteServiceException("用户师傅编号" + user.getWorkerNumber() + "与本次传入" + user.getIdCard() + "师傅编号" + websitUser.getWorkerNumber() + "不一致"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             user.setType(UserTypeEnum.WORKER.getKey()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             user.setWorkerNumber(websitUser.getWorkerNumber()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -703,7 +703,7 @@ public class UserLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 用户师傅编号不为空并且师傅编号与传入师傅编号不一致,抛错 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (StringUtils.isNotBlank(user.getWorkerNumber() ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 && !StringUtils.equals(user.getWorkerNumber(), workerNumber)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            throw new RemoteServiceException("用户师傅编号" + user.getWorkerNumber() + "与本次传入师傅编号" + workerNumber + "不一致"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            throw new RemoteServiceException("用户师傅编号" + user.getWorkerNumber() + "与本次传入" + user.getIdCard() + "师傅编号" + workerNumber + "不一致"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 先清空网点师傅记录 
			 |