2023年10月24日17:30:42

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -101,7 +101,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				if (ObjectUtils.isNull(tenant) || ObjectUtils.isNull(tenant.getData())) {
 					throw new UsernameNotFoundException("未查到租户信息");
 				}
-				user = userClient.loginByAccount(null, username, "4", tenant.getData().getTenantId());
+				user = userClient.loginByAccount(null, username, "4", tenant.getData().getTenantId(),appletsId);
 				if (ObjectUtils.isNull(user)) {
 					if ("wx0a0feca24b695636".equals(appletsId)) {
 						throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
@@ -113,6 +113,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 					//用户不存在，注册用户
 					User saveUser = new User();
 					saveUser.setOpenId(openId);
+					saveUser.setAppletsId(appletsId);
 					saveUser.setUnionId(unionId);
 					saveUser.setTenantId(tenant.getData().getTenantId());
 					saveUser.setUserType(1);
@@ -138,9 +139,9 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				}
 
 			} else {
-				user = userClient.loginByAccount(username, null, "2", null);
+				user = userClient.loginByAccount(username, null, "2", null,null);
 				if (ObjectUtils.isNull(user)) {
-					user = userClient.loginByAccount(null, username, "2", null);
+					user = userClient.loginByAccount(null, username, "2", null,null);
 					if (ObjectUtils.isNull(user)) {
 						throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
 					}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java

@@ -111,5 +111,11 @@ public class Dept implements Serializable {
 	@ApiModelProperty(value = "积分余额")
 	private BigDecimal pointsBalance;
 
+	/**
+	 * 小程序id
+	 */
+	@ApiModelProperty(value = "小程序id")
+	private String appletsId;
+
 
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -140,4 +140,10 @@ public class User extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "积分余额")
 	private BigDecimal pointsBalance;
+
+	/**
+	 * 小程序id
+	 */
+	@ApiModelProperty(value = "小程序id")
+	private String appletsId;
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -233,7 +233,8 @@ public interface IUserClient {
 	User loginByAccount(@RequestParam(value = "account", required = false) String account,
 						@RequestParam(value = "phone", required = false) String phone,
 						@RequestParam(value = "userType", required = false) String userType,
-						@RequestParam(value = "tenantId", required = false) String tenantId
+						@RequestParam(value = "tenantId", required = false) String tenantId,
+						@RequestParam(value = "appletsId", required = false) String appletsId
 	);
 
 	@GetMapping(SELECT_USER_BY_NAMES)

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -29,6 +29,7 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
+import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -813,7 +814,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 			} else {
 				//保护客户联系人信息
 				CorpsAttn corpsAttn1 = new CorpsAttn();
-				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId());
+				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId(),null);
 				if (ObjectUtils.isNotNull(user)) {
 					corpsAttn1.setUserId(user.getId());
 				}
@@ -876,7 +877,11 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 				String tenantId = corpsDesc.getTenantId();
 				//保护客户联系人信息
 				CorpsAttn corpsAttn = new CorpsAttn();
-				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId());
+				R<Dept> resDept = sysClient.getDept(Long.parseLong(AuthUtil.getDeptId()));
+				if (!resDept.isSuccess() || ObjectUtils.isNotNull(resDept.getData())){
+					throw new RuntimeException("未找到小程序id");
+				}
+				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId(),resDept.getData().getAppletsId());
 				if (ObjectUtils.isNotNull(user)) {
 					corpsAttn.setUserId(user.getId());
 				}

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -36,6 +36,7 @@ import org.springblade.los.business.sea.vo.BillsVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 业务-海运进出口 控制器
@@ -75,14 +76,62 @@ public class BillsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bills.getBillType()), Bills::getBillType, bills.getBillType())
 			.eq(ObjectUtils.isNotNull(bills.getBusinessType()), Bills::getBusinessType, bills.getBusinessType())
 			.eq(ObjectUtils.isNotNull(bills.getSeaType()), Bills::getSeaType, bills.getSeaType())
+			.and(i -> i.isNull(Bills::getMasterId).or()
+				.eq(Bills::getMasterId, 0))
+			.eq(ObjectUtils.isNotNull(bills.getBillStatus()), Bills::getBillStatus, bills.getBillStatus())
+			.eq(ObjectUtils.isNotNull(bills.getPlaceReceiptId()), Bills::getPlaceReceiptId, bills.getPlaceReceiptId())
+			.eq(ObjectUtils.isNotNull(bills.getPolId()), Bills::getPolId, bills.getPolId())
+			.like(ObjectUtils.isNotNull(bills.getBillNo()), Bills::getBillNo, bills.getBillNo())
+			.like(ObjectUtils.isNotNull(bills.getHblno()), Bills::getHblno, bills.getHblno())
+			.like(ObjectUtils.isNotNull(bills.getMblno()), Bills::getMblno, bills.getMblno())
+			.like(ObjectUtils.isNotNull(bills.getCreateUserName()), Bills::getCreateUserName, bills.getCreateUserName())
+			.and(ObjectUtils.isNotNull(bills.getPolCnName()), i -> i.like(Bills::getPolCnName, bills.getPolCnName()).or()
+				.like(Bills::getPolCode, bills.getPolCnName()).or().like(Bills::getPolEnName, bills.getPolCnName()))
+			.and(ObjectUtils.isNotNull(bills.getCorpCnName()), i -> i.like(Bills::getCorpCnName, bills.getCorpCnName()).or()
+				.like(Bills::getCorpEnName, bills.getCorpCnName()))
+			.and(ObjectUtils.isNotNull(bills.getPlaceReceiptName()), i -> i.like(Bills::getPlaceReceiptCode, bills.getPlaceReceiptName()).or()
+				.like(Bills::getPlaceReceiptName, bills.getPlaceReceiptName()))
+			.like(ObjectUtils.isNotNull(bills.getCorpArgreementNo()), Bills::getBillNo, bills.getBillNo())
+			.like(ObjectUtils.isNotNull(bills.getVoyageNo()), Bills::getBillNo, bills.getBillNo())
+			.and(ObjectUtils.isNotNull(bills.getCarrierCnName()), i -> i.like(Bills::getCarrierCnName, bills.getCarrierCnName()).or()
+				.like(Bills::getCarrierEnName, bills.getCarrierCnName()).or().like(Bills::getCarrierArgreementNo, bills.getCarrierCnName()))
+			.and(ObjectUtils.isNotNull(bills.getCyCode()), i -> i.like(Bills::getCyCode, bills.getCyCode()).or()
+				.like(Bills::getCyCnName, bills.getCyCode()).or().like(Bills::getCyEnName, bills.getCyCode()))
+			.and(ObjectUtils.isNotNull(bills.getVesselCnName()), i -> i.like(Bills::getVesselCnName, bills.getVesselCnName()).or()
+				.like(Bills::getVesselEnName, bills.getVesselCnName()))
+			.orderByDesc(Bills::getCreateTime);
+		IPage<Bills> pages = billsService.page(Condition.getPage(query), lambdaQueryWrapper);
+		return R.data(pages);
+	}
+
+	/**
+	 * 业务-海运进List
+	 */
+	@GetMapping("/listAll")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "listAll", notes = "传入bills")
+	public R<List<Bills>> list(Bills bills) {
+		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
+			.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.eq(ObjectUtils.isNotNull(bills.getBillType()), Bills::getBillType, bills.getBillType())
+			.eq(ObjectUtils.isNotNull(bills.getBusinessType()), Bills::getBusinessType, bills.getBusinessType())
+			.eq(ObjectUtils.isNotNull(bills.getSeaType()), Bills::getSeaType, bills.getSeaType())
 			.eq(ObjectUtils.isNotNull(bills.getMasterBillNo()), Bills::getMasterBillNo, bills.getMasterBillNo())
 			.eq(ObjectUtils.isNotNull(bills.getMasterId()), Bills::getMasterId, bills.getMasterId())
+			.eq(ObjectUtils.isNotNull(bills.getBillStatus()), Bills::getBillStatus, bills.getBillStatus())
+			.eq(ObjectUtils.isNotNull(bills.getPlaceReceiptId()), Bills::getPlaceReceiptId, bills.getPlaceReceiptId())
+			.eq(ObjectUtils.isNotNull(bills.getPolId()), Bills::getPolId, bills.getPolId())
 			.like(ObjectUtils.isNotNull(bills.getBillNo()), Bills::getBillNo, bills.getBillNo())
-			.like(ObjectUtils.isNotNull(bills.getHblno()), Bills::getBillNo, bills.getBillNo())
-			.like(ObjectUtils.isNotNull(bills.getMblno()), Bills::getBillNo, bills.getBillNo())
+			.like(ObjectUtils.isNotNull(bills.getHblno()), Bills::getHblno, bills.getHblno())
+			.like(ObjectUtils.isNotNull(bills.getMblno()), Bills::getMblno, bills.getMblno())
 			.like(ObjectUtils.isNotNull(bills.getCreateUserName()), Bills::getCreateUserName, bills.getCreateUserName())
+			.and(ObjectUtils.isNotNull(bills.getPolCnName()), i -> i.like(Bills::getPolCnName, bills.getPolCnName()).or()
+				.like(Bills::getPolCode, bills.getPolCnName()).or().like(Bills::getPolEnName, bills.getPolCnName()))
 			.and(ObjectUtils.isNotNull(bills.getCorpCnName()), i -> i.like(Bills::getCorpCnName, bills.getCorpCnName()).or()
 				.like(Bills::getCorpEnName, bills.getCorpCnName()))
+			.and(ObjectUtils.isNotNull(bills.getPlaceReceiptName()), i -> i.like(Bills::getPlaceReceiptCode, bills.getPlaceReceiptName()).or()
+				.like(Bills::getPlaceReceiptName, bills.getPlaceReceiptName()))
 			.like(ObjectUtils.isNotNull(bills.getCorpArgreementNo()), Bills::getBillNo, bills.getBillNo())
 			.like(ObjectUtils.isNotNull(bills.getVoyageNo()), Bills::getBillNo, bills.getBillNo())
 			.and(ObjectUtils.isNotNull(bills.getCarrierCnName()), i -> i.like(Bills::getCarrierCnName, bills.getCarrierCnName()).or()
@@ -92,7 +141,7 @@ public class BillsController extends BladeController {
 			.and(ObjectUtils.isNotNull(bills.getVesselCnName()), i -> i.like(Bills::getVesselCnName, bills.getVesselCnName()).or()
 				.like(Bills::getVesselEnName, bills.getVesselCnName()))
 			.orderByDesc(Bills::getCreateTime);
-		IPage<Bills> pages = billsService.page(Condition.getPage(query), lambdaQueryWrapper);
+		List<Bills> pages = billsService.list(lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -421,6 +421,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				|| (ObjectUtils.isNull(bills.getMeasurement()) || new BigDecimal("0.00").compareTo(bills.getMeasurement()) == 0)) {
 				throw new RuntimeException("件重尺为空或为零撤销失败");
 			}
+			bills.setMasterBillNo("");
+			bills.setMasterId(0L);
 			bills.setQuantity(bills.getQuantity().subtract(billsList.stream().map(Bills::getQuantity).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add)));
 			bills.setGrossWeight(bills.getGrossWeight().subtract(billsList.stream().map(Bills::getGrossWeight).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add)));
 			bills.setNetWeight(bills.getNetWeight().subtract(billsList.stream().map(Bills::getNetWeight).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add)));

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -5622,7 +5622,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			sendMessage.setUrl("/exportTrade/purchaseContract/index");
 			sendMessage.setPageLabel(order.getPageLabel());
 			sendMessage.setPageStatus(order.getPageStatus());
-			sendMessage.setMessageBody("您有采购订单" + selectOrder.getSysNo() + "待处理,请查看");
+			sendMessage.setMessageBody("您有采购任务" + selectOrder.getSysNo() + "待处理,请查看");
 			R save = messageClient.save(sendMessage);
 			if (!save.isSuccess()) {
 				throw new SecurityException("发送消息失败");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -264,6 +264,9 @@ public class BrandDescController extends BladeController {
 			.eq(PjBrandDesc::getType, brandDesc.getType())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
 			.orderByDesc(PjBrandDesc::getSort);
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
+		}
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);
 		list.forEach(e -> {
 			if (0 == e.getEnableOrNot()) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsStatisticsController.java

@@ -65,7 +65,7 @@ public class CorpsStatisticsController {
 				lambdaQueryWrapper.eq(PjOrder::getBsType, "CG");
 			}
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());
-			lambdaQueryWrapper.apply("(( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))");
+			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			if (ObjectUtils.isNotNull(corpsDescDto1.getCreditLimit()) && ObjectUtils.isNotNull(corpsDescDto1.getUseCreditLimit())) {
 				corpsDescDto1.setCreditLimitBalance(corpsDescDto1.getCreditLimit().subtract(corpsDescDto1.getUseCreditLimit()));
 			}
@@ -117,7 +117,7 @@ public class CorpsStatisticsController {
 				lambdaQueryWrapper.eq(PjOrder::getBsType, "CG");
 			}
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());
-			lambdaQueryWrapper.apply("(( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))");
+			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			List<PjOrder> orderList = orderService.list(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderList)) {
 				BigDecimal sumAmount = orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -159,7 +159,7 @@ public class CorpsStatisticsController {
 			if (ObjectUtils.isNotNull(corpsDescDto1.getCreditLimit()) && ObjectUtils.isNotNull(corpsDescDto1.getUseCreditLimit())) {
 				corpsDescDto1.setCreditLimitBalance(corpsDescDto1.getCreditLimit().subtract(corpsDescDto1.getUseCreditLimit()));
 			}
-			lambdaQueryWrapper.apply("(( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))");
+			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			List<PjOrder> orderList = orderService.list(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderList)) {
 				BigDecimal totalAmount = orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -702,7 +702,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 			} else {
 				//保存客户联系人信息
 				PjCorpsAttn corpsAttn1 = new PjCorpsAttn();
-				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId());
+				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId(), null);
 				if (ObjectUtils.isNotNull(user)) {
 					corpsAttn1.setUserId(user.getId());
 				}
@@ -762,7 +762,11 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 
 				//保存客户联系人信息
 				PjCorpsAttn corpsAttn = new PjCorpsAttn();
-				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId());
+				R<Dept> resDept = sysClient.getDept(Long.parseLong(AuthUtil.getDeptId()));
+				if (!resDept.isSuccess() || ObjectUtils.isNotNull(resDept.getData())){
+					throw new RuntimeException("未找到小程序id");
+				}
+				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId(), resDept.getData().getAppletsId());
 				if (ObjectUtils.isNotNull(user)) {
 					corpsAttn.setUserId(user.getId());
 				}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -114,7 +114,7 @@ public class GoodsDescController extends BladeController {
 
 		lambdaQueryWrapper.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjGoodsDesc::getIsDeleted, 0)
-//			.eq(PjGoodsDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
+			.eq(PjGoodsDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
 			.like(StringUtils.isNotBlank(goods.getSpecificationAndModel()), PjGoodsDesc::getSpecificationAndModel, goods.getSpecificationAndModel())//规格型号
 			.like(StringUtils.isNotBlank(goods.getBrandItem()), PjGoodsDesc::getBrandItem, goods.getBrandItem())//花纹
 			.eq(ObjectUtils.isNotEmpty(goods.getBrandId()), PjGoodsDesc::getBrandId, goods.getBrandId())//品牌

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsTypeController.java

@@ -83,6 +83,7 @@ public class GoodsTypeController extends BladeController {
 	public R<IPage<PjGoodsType>> list(PjGoodsType goodsType, Query query) {
 		goodsType.setTenantId(AuthUtil.getTenantId());
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
+		goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		IPage<PjGoodsType> pages = goodsTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsType));
 		return R.data(pages);
 	}
@@ -96,6 +97,7 @@ public class GoodsTypeController extends BladeController {
 	public R<IPage<GoodsTypeVO>> page(GoodsTypeVO goodsType, Query query) {
 		goodsType.setTenantId(AuthUtil.getTenantId());
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
+		goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		IPage<GoodsTypeVO> pages = goodsTypeService.selectGoodsTypePage(Condition.getPage(query), goodsType);
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/mapper/GoodsTypeMapper.xml

@@ -105,6 +105,9 @@ WHERE
         <if test="GoodsType.status!=null">
             and dept.status = #{GoodsType.status}
         </if>
+        <if test="GoodsType.salesCompanyId!=null">
+            and dept.sales_company_id = #{GoodsType.salesCompanyId}
+        </if>
         <if test="GoodsType.type!=null">
             and dept.type = #{GoodsType.type}
         </if>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -140,12 +140,14 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 		}
 		Integer count = baseMapper.selectCount(Wrappers.<PjGoodsDesc>lambdaQuery()
 			.eq(PjGoodsDesc::getCode, goodsDesc.getCode())
+			.eq(PjGoodsDesc::getSalesCompanyId, goodsDesc.getSalesCompanyId())
 			.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjGoodsDesc::getIsDeleted, 0)
 		);
 
 		Integer countName = baseMapper.selectCount(Wrappers.<PjGoodsDesc>lambdaQuery()
 			.eq(PjGoodsDesc::getCname, goodsDesc.getCname())
+			.eq(PjGoodsDesc::getSalesCompanyId, goodsDesc.getSalesCompanyId())
 			.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjGoodsDesc::getIsDeleted, 0)
 		);
@@ -163,7 +165,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 			goodsDesc.setCreateUser(AuthUtil.getUserId());
 			goodsDesc.setCreateTime(new Date());
 			goodsDesc.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-//			goodsDesc.setTenantId(AuthUtil.getTenantId());
+			goodsDesc.setTenantId(AuthUtil.getTenantId());
 			String[] deptId = AuthUtil.getDeptId().split(",");
 			if (deptId.length > 0) {
 				goodsDesc.setSalesCompanyId(Long.parseLong(deptId[0]));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsTypeServiceImpl.java

@@ -28,6 +28,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
+import org.springblade.salesPart.entity.PjGoodsDesc;
 import org.springblade.salesPart.entity.PjGoodsType;
 import org.springblade.salesPart.goods.mapper.GoodsTypeMapper;
 import org.springblade.salesPart.goods.service.IGoodsTypeService;
@@ -151,6 +152,7 @@ public class GoodsTypeServiceImpl extends ServiceImpl<GoodsTypeMapper, PjGoodsTy
 			.ne(Objects.nonNull(goodsType.getId()), PjGoodsType::getId, goodsType.getId())
 			.eq(PjGoodsType::getType, goodsType.getType())
 			.eq(PjGoodsType::getCname, goodsType.getCname())
+			.eq(PjGoodsType::getSalesCompanyId, goodsType.getSalesCompanyId())
 			.eq(PjGoodsType::getTenantId, goodsType.getTenantId())
 			.eq(PjGoodsType::getIsDeleted,0)
 		);

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -211,12 +211,13 @@ public class UserClient implements IUserClient {
 	 * @return
 	 */
 	@Override
-	public User loginByAccount(String account, String phone, String userType, String tenantId) {
+	public User loginByAccount(String account, String phone, String userType, String tenantId,String appletsId) {
 		LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		userLambdaQueryWrapper.eq(ObjectUtils.isNotNull(account), User::getAccount, account);
 		userLambdaQueryWrapper.eq(ObjectUtils.isNotNull(phone), User::getPhone, phone);
 		userLambdaQueryWrapper.eq(ObjectUtils.isNotNull(userType), User::getUserType, userType);
 		userLambdaQueryWrapper.eq(ObjectUtils.isNotNull(tenantId), User::getTenantId, tenantId);
+		userLambdaQueryWrapper.eq(ObjectUtils.isNotNull(appletsId), User::getAppletsId, appletsId);
 		userLambdaQueryWrapper.eq(User::getIsDeleted, 0);
 		return service.getOne(userLambdaQueryWrapper);
 	}