| 
					
				 | 
			
			
				@@ -3,7 +3,7 @@ package com.gree.mall.manager.logic.common; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.core.convert.Convert; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.poi.excel.ExcelReader; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.poi.excel.ExcelUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.alibaba.excel.util.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import org.apache.commons.lang3.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.metadata.IPage; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.toolkit.IdWorker; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -295,7 +295,11 @@ public class SysDictCompanyLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public List<SysDictCompany> getSysDictList(String dictType) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        List<SysDictCompany> list = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictType, dictType).list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        AdminUserCom adminUser = commonLogic.getAdminUser(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<SysDictCompany> list = sysDictCompanyService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(SysDictCompany::getDictType, dictType) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(StringUtils.isNotBlank(adminUser.getCompanyWechatId()), SysDictCompany::getCompanyWechatId, adminUser.getCompanyWechatId()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |