| 
					
				 | 
			
			
				@@ -7,7 +7,10 @@ import com.fs.company.domain.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fs.company.mapper.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fs.company.param.CompanyParam; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fs.company.service.ICompanyService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.fs.company.vo.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.fs.company.vo.CompanyCrmVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.fs.company.vo.CompanyNameVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.fs.company.vo.CompanyVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.fs.company.vo.DeptDataVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fs.course.mapper.FsCourseRedPacketLogMapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fs.his.vo.OptionsVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fs.store.config.StoreConfig; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -24,7 +27,10 @@ import org.springframework.stereotype.Service; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.transaction.annotation.Transactional; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.math.BigDecimal; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import java.util.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.ArrayList; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.Date; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.Map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.stream.Collectors; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 /** 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -163,6 +169,7 @@ public class CompanyServiceImpl implements ICompanyService 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             user.setSex("0"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             user.setStatus("0"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             user.setIsDel(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            user.setIsAudit(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             userMapper.insertCompanyUser(user); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //添加用户角色表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             CompanyUserRole userRole=new CompanyUserRole(); 
			 |