Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -36,6 +36,7 @@ import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import lombok.extern.log4j.Log4j2;
+import org.checkerframework.checker.units.qual.A;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -220,8 +221,8 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 				if (deptIds.isEmpty()) {
 					return null;
 				}
-                assert results != null;
-                results.addAll(baseMapper.selectList(Wrappers.<BasicdataWarehouseEntity>query().lambda().in(BasicdataWarehouseEntity::getDepartment, deptIds))) ;
+
+                results=baseMapper.selectList(Wrappers.<BasicdataWarehouseEntity>query().lambda().in(BasicdataWarehouseEntity::getDepartment, deptIds)) ;
 
 			}