| 
						
						
							
								
							
						
						
					 | 
					@ -970,10 +970,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Override | 
					 | 
					 | 
					    @Override | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    public Result<DeptOption> getUserDeptOptionByUserId(String userId) { | 
					 | 
					 | 
					    public Result<DeptOption> getUserDeptOptionByUserId(String userId) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Long realUserId = Long.parseLong(userId); | 
					 | 
					 | 
					        Long realUserId = Long.parseLong(userId); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					        String deptOptionKey = RedisKeys.getAllAdminUserDeptOptionKey(realUserId); | 
					 | 
					 | 
					        String deptOptionKey = RedisKeys.getAdminUserDeptOptionKey(realUserId); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        Object obj = redisUtils.get(deptOptionKey); | 
					 | 
					 | 
					        Object obj = redisUtils.get(deptOptionKey); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if (null == obj) { | 
					 | 
					 | 
					        if (null == obj) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            this.packageAllUserDeptOption(realUserId); | 
					 | 
					 | 
					            this.packageUserDeptOption(realUserId); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					            obj = redisUtils.get(deptOptionKey); | 
					 | 
					 | 
					            obj = redisUtils.get(deptOptionKey); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return new Result<DeptOption>().ok((DeptOption) obj); | 
					 | 
					 | 
					        return new Result<DeptOption>().ok((DeptOption) obj); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |