| 
					
				 | 
			
			
				@@ -100,11 +100,11 @@ public class OrgServiceImpl implements OrgService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public int update(Org org) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Org orgType = orgMapper.findOrgType(org); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(!orgType.getOrgType().equals(org.getOrgType())&&org.getChildType()!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(org.getOrgType().equals("department") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(!orgType.getOrgType().equals(org.getOrgType())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(orgType.getChildType()!=null&&org.getOrgType().equals("department") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     &&orgType.getChildType().equals("company")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     return -2; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }else if(org.getOrgType().equals("company")&& 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }else if(orgType.getParentOrgId()!=null&&org.getOrgType().equals("company")&& 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                       orgType.getParentType().equals("department")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     return -3; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 |