| 
					
				 | 
			
			
				@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.Employee; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.service.OaUserService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.oa.OaFeignService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.oa.entity.OAUser; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.ym.mec.oa.entity.PostDept; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.scheduling.annotation.Async; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -30,9 +31,9 @@ public class OaServiceImpl implements OaUserService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         oaUser.setPostIds(JSON.parseArray(employee.getPostIds(), Integer.class)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         oaUser.setAvatar(employee.getAvatar()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), OAUser.postDept.class)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (oaUser.getPostDeptIds() != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(OAUser.postDept::getPostId).collect(Collectors.toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             oaUser.setPostIds(postIds); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return oaFeignService.register(oaUser); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -50,9 +51,9 @@ public class OaServiceImpl implements OaUserService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         oaUser.setPostIds(JSON.parseArray(employee.getPostIds(), Integer.class)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         oaUser.setAvatar(employee.getAvatar()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), OAUser.postDept.class)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (oaUser.getPostDeptIds() != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(OAUser.postDept::getPostId).collect(Collectors.toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             oaUser.setPostIds(postIds); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return oaFeignService.updateUser(oaUser); 
			 |