提交返回表单id、查询保存销售公司

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/inventory/entity/PjStockDesc.java

@@ -265,6 +265,7 @@ public class PjStockDesc implements Serializable {
 			this.createDept = Long.valueOf(bladeUser.getDeptId());
 			this.createTime = new Date();
 			this.version = 1;
+			this.salesCompanyId = Long.valueOf(bladeUser.getDeptId());
 			return;
 		}
 		this.updateUser = bladeUser.getUserId();

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/inventory/controller/StockDescController.java

@@ -56,14 +56,14 @@ public class StockDescController extends BladeController {
 		lambdaQueryWrapper.eq(PjStockDesc::getTenantId, bladeUser.getTenantId())
 			.eq(PjStockDesc::getIsDeleted, 0)
 			.eq(PjStockDesc::getSalesCompanyId, bladeUser.getDeptId())
-			.like(ObjectUtil.isNotEmpty(stockDesc.getCode()), PjStockDesc::getCode, stockDesc.getCode())
-			.like(ObjectUtil.isNotEmpty(stockDesc.getTypeNo()), PjStockDesc::getTypeNo, stockDesc.getTypeNo())
+			.like(StringUtils.hasText(stockDesc.getCode()), PjStockDesc::getCode, stockDesc.getCode())
+			.like(StringUtils.hasText(stockDesc.getTypeNo()), PjStockDesc::getTypeNo, stockDesc.getTypeNo())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId())
-			.like(ObjectUtil.isNotEmpty(stockDesc.getStorageName()), PjStockDesc::getStorageName, stockDesc.getStorageName())
+			.like(StringUtils.hasText(stockDesc.getStorageName()), PjStockDesc::getStorageName, stockDesc.getStorageName())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandId()), PjStockDesc::getBrandId, stockDesc.getBrandId())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandName()), PjStockDesc::getBrandName, stockDesc.getBrandName())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getGoodsTypeId()), PjStockDesc::getGoodsTypeId, stockDesc.getGoodsTypeId())
-			.like(ObjectUtil.isNotEmpty(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot());
+			.like(StringUtils.hasText(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot());
 		lambdaQueryWrapper.like(StringUtils.hasText(stockDesc.getCname()),  PjStockDesc::getCname, stockDesc.getCname());
 		lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
 		IPage<PjStockDesc> pages = stockDescService.page(Condition.getPage(query), lambdaQueryWrapper);

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/inventory/impl/StockDescServiceImpl.java

@@ -43,7 +43,8 @@ public class StockDescServiceImpl extends ServiceImpl<StockDescMapper, PjStockDe
 		stockDesc.setTenantId(bladeUser.getTenantId());
 		stockDesc.setUserAndDept(bladeUser);
 		stockDesc.setStatus(CommonEnum.ONE.info);
-		return R.status(this.saveOrUpdate(stockDesc));
+		boolean result = this.saveOrUpdate(stockDesc);
+		return result ? R.data(stockDesc.getId(), "提交成功") : R.fail("提交失败");
 	}
 
 	@Override
@@ -57,7 +58,8 @@ public class StockDescServiceImpl extends ServiceImpl<StockDescMapper, PjStockDe
 		stockDesc.setTenantId(bladeUser.getTenantId());
 		stockDesc.setUserAndDept(bladeUser);
 		stockDesc.setStatus(CommonEnum.ZERO.info);
-		return R.status(this.saveOrUpdate(stockDesc));
+		boolean result = this.saveOrUpdate(stockDesc);
+		return result ? R.data(stockDesc.getId(), "提交成功") : R.fail("提交失败");
 	}
 
 	@Override