Merge branch 'dev' into pre-production

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java

@@ -56,7 +56,7 @@ public class FactoryAuthServiceImpl implements IFactoryAuthService {
 
 		//查询是否有当前账户的token数据
 		QueryWrapper<FactoryToken> queryTokenWrapper = new QueryWrapper<>();
-		queryWrapper.eq("corpid",corpId);
+		queryTokenWrapper.eq("corpid",corpId);
 		FactoryToken factoryToken = factoryTokenService.getOne(queryTokenWrapper);
 		if(Objects.isNull(factoryToken)){
 			factoryToken = new FactoryToken();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java

@@ -30,8 +30,6 @@ import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.tool.api.R;
-import org.springblade.system.entity.User;
 import org.springblade.system.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
 
@@ -62,10 +60,10 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 			.collect(Collectors.toList());
 		warehouseUpdownGoodsLog.setWarehouseIdList(collect);
 		//查询操作员
-		if (null != warehouseUpdownGoodsLog.getCreateUserName()){
-			R<List<User>> listR = userSearchClient.listByName(warehouseUpdownGoodsLog.getCreateUserName());
-			log.info("listR>>>>{}",listR);
-		}
+//		if (null != warehouseUpdownGoodsLog.getCreateUserName()){
+//			R<List<User>> listR = userSearchClient.listByName(warehouseUpdownGoodsLog.getCreateUserName());
+//			log.info("listR>>>>{}",listR);
+//		}
 		List<WarehouseUpdownGoodsLogVO> warehouseUpdownGoodsLogVOS = baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog);
 		return page.setRecords(warehouseUpdownGoodsLogVOS);
 	}