纪新园 пре 2 година
родитељ
комит
bf99c4e585
35 измењених фајлова са 64 додато и 30 уклоњено
  1. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjAccountManagement.java
  2. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandDesc.java
  3. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandFiles.java
  4. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAddr.java
  5. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAttn.java
  6. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsDesc.java
  7. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsFiles.java
  8. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsType.java
  9. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsTypeDesc.java
  10. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsDesc.java
  11. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsFiles.java
  12. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsType.java
  13. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsTypeDesc.java
  14. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjHistory.java
  15. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java
  16. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrderItems.java
  17. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjPayment.java
  18. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunch.java
  19. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunchFiles.java
  20. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlement.java
  21. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlementItems.java
  22. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShip.java
  23. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShipItems.java
  24. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShoppingCart.java
  25. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStockDesc.java
  26. 2 1
      blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStorageDesc.java
  27. 2 2
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/accountManagement/controller/AccountManagementController.java
  28. 1 1
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/accountManagement/service/impl/AccountManagementServiceImpl.java
  29. 1 1
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsAddrServiceImpl.java
  30. 2 0
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java
  31. 2 0
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java
  32. 1 0
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java
  33. 1 0
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/service/impl/ProductLaunchServiceImpl.java
  34. 1 0
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java
  35. 1 0
      blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjAccountManagement.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -47,7 +48,7 @@ public class PjAccountManagement implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();
 	/**
 	 * 创建人
 	 */

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandDesc.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -48,7 +49,7 @@ public class PjBrandDesc implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandFiles.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -53,7 +54,7 @@ public class PjBrandFiles implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	* 排序

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAddr.java

@@ -25,6 +25,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发客户明细地址实体类
@@ -53,7 +54,7 @@ public class PjCorpsAddr implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAttn.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -52,7 +53,7 @@ public class PjCorpsAttn implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsDesc.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -49,7 +50,7 @@ public class PjCorpsDesc implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsFiles.java

@@ -24,6 +24,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发客户附件实体类
@@ -52,7 +53,7 @@ public class PjCorpsFiles implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 排序
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsType.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -80,7 +81,7 @@ public class PjCorpsType implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	 * 创建人
 	 */

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsTypeDesc.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -64,7 +65,7 @@ public class PjCorpsTypeDesc implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsDesc.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -50,7 +51,7 @@ public class PjGoodsDesc implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	 * 创建人

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsFiles.java

@@ -25,6 +25,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发商品附件实体类
@@ -49,7 +50,7 @@ public class PjGoodsFiles implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	* 主表id

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsType.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 
 import java.io.Serializable;
@@ -83,7 +84,7 @@ public class PjGoodsType implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	 * 创建人
 	 */

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsTypeDesc.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -61,7 +62,7 @@ public class PjGoodsTypeDesc implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjHistory.java

@@ -25,6 +25,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 轮胎配件历史记录表实体类
@@ -49,7 +50,7 @@ public class PjHistory implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	* 创建人

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -29,6 +29,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.pay.tonglianPayment.entity.WechatMark;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -54,7 +55,7 @@ public class PjOrder implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 订单编号
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrderItems.java

@@ -29,6 +29,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件销售采购明细实体类
@@ -52,7 +53,7 @@ public class PjOrderItems implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 主表id
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjPayment.java

@@ -26,6 +26,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发支付记录实体类
@@ -50,7 +51,7 @@ public class PjPayment implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	* 创建人

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunch.java

@@ -30,6 +30,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发产品上架实体类
@@ -53,7 +54,7 @@ public class PjProductLaunch implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunchFiles.java

@@ -25,6 +25,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发上架管理附件实体类
@@ -49,7 +50,7 @@ public class PjProductLaunchFiles implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	* 主表id

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlement.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -171,7 +172,7 @@ public class PjSettlement implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	 * 类型

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlementItems.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -135,6 +136,6 @@ public class PjSettlementItems implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 }

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShip.java

@@ -29,6 +29,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.salesPart.vo.ShipVO;
 
 /**
@@ -53,7 +54,7 @@ public class PjShip implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 单据编号(任务不显示,工单显示)
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShipItems.java

@@ -26,6 +26,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发收发货明细实体类
@@ -60,7 +61,7 @@ public class PjShipItems implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	* 创建人

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShoppingCart.java

@@ -30,6 +30,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  *
@@ -55,7 +56,7 @@ public class PjShoppingCart implements Serializable {
 	 * 租户id
 	 */
 		@ApiModelProperty(value = "租户id")
-		private String tenantId;
+		private String tenantId = AuthUtil.getTenantId();;
 
 	/**
 	* 单据编号

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStockDesc.java

@@ -30,6 +30,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发库存表实体类
@@ -53,7 +54,7 @@ public class PjStockDesc implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 1
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStorageDesc.java

@@ -26,6 +26,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.secure.utils.AuthUtil;
 
 /**
  * 配件批发仓库实体类
@@ -49,7 +50,7 @@ public class PjStorageDesc implements Serializable {
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	private String tenantId = AuthUtil.getTenantId();;
 	/**
 	* 创建人
 	*/

+ 2 - 2
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/accountManagement/controller/AccountManagementController.java

@@ -128,9 +128,9 @@ public class AccountManagementController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入accountManagement")
 	public R submit(@Valid @RequestBody PjAccountManagement accountManagement) {
-		if (StringUtils.isNotBlank(accountManagement.getTenantId())){
+		/*if (StringUtils.isNotBlank(accountManagement.getTenantId())){
 			accountManagement.setTenantId(AuthUtil.getTenantId());
-		}
+		}*/
 		PjAccountManagement management = accountManagementService.saveMessage(accountManagement);
 		return R.data(management);
 	}

+ 1 - 1
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/accountManagement/service/impl/AccountManagementServiceImpl.java

@@ -84,7 +84,7 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
 			accountManagement.setCreateUser(AuthUtil.getUserId());
 			accountManagement.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 			accountManagement.setCreateTime(new Date());
-			accountManagement.setTenantId(AuthUtil.getTenantId());
+//			accountManagement.setTenantId(AuthUtil.getTenantId());
 			accountManagement.setEnableOrNot(0);
 			accountManagement.setAccountBalance(accountManagement.getOpeningAmount());
 			baseMapper.insert(accountManagement);

+ 1 - 1
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsAddrServiceImpl.java

@@ -100,7 +100,7 @@ public class CorpsAddrServiceImpl extends ServiceImpl<CorpsAddrMapper, PjCorpsAd
 			}
 		}
 		if (corpsAddr.getId() == null) {
-
+			corpsAddr.setTenantId(AuthUtil.getTenantId());
 			corpsAddr.setCreateTime(new Date());
 			corpsAddr.setCreateUser(AuthUtil.getUserId());
 			baseMapper.insert(corpsAddr);

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

@@ -281,6 +281,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 						middle.setCorpId(corpsDesc.getId());
 						middle.setCorpTypeId(corpsType.getId());
 						middle.setCreateTime(new Date());
+						middle.setTenantId(AuthUtil.getTenantId());
 						middle.setCreateUser(AuthUtil.getUserId());
 						middle.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 						corpsTypeDescMapper.insert(middle);
@@ -371,6 +372,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 						PjCorpsTypeDesc middle = new PjCorpsTypeDesc();
 						middle.setCorpId(corpsDesc.getId());
 						middle.setCorpTypeId(corpsType.getId());
+						middle.setTenantId(AuthUtil.getTenantId());
 						middle.setCreateTime(new Date());
 						middle.setCreateUser(AuthUtil.getUserId());
 						middle.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));

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

@@ -347,6 +347,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 				queryWrapper.eq(PjGoodsDesc::getIsDeleted, 0);
 				PjGoodsDesc one = baseMapper.selectOne(queryWrapper);
 				if (one == null) {
+					goodsDesc.setTenantId(AuthUtil.getTenantId());
 					goodsDesc.setCreateTime(new Date());
 					goodsDesc.setCreateUser(AuthUtil.getUserId());
 					goodsDesc.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
@@ -356,6 +357,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 					goodsTypeDes.setGoodsId(goodsDesc.getId());
 					goodsTypeDes.setGoodsTypeId(goodsType.getId());
 					goodsTypeDes.setCreateTime(new Date());
+					goodsTypeDes.setTenantId(AuthUtil.getTenantId());
 					goodsTypeDes.setCreateUser(AuthUtil.getUserId());
 					goodsTypeDes.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 					goodsTypeDescMapper.insert(goodsTypeDes);

+ 1 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -782,6 +782,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 							shipItems.setCreateUser(AuthUtil.getUserId());
 							shipItems.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 							shipItems.setSendNum(e.getSendNum());
+							shipItems.setTenantId(AuthUtil.getTenantId());
 							if (ObjectUtils.isNotNull(shipItems.getCostprie()) && new BigDecimal("0.00").compareTo(shipItems.getCostprie()) != 0) {
 								shipItems.setPrice(shipItems.getCostprie().divide(e.getGoodsNum(), MathContext.DECIMAL32));
 							}

+ 1 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/service/impl/ProductLaunchServiceImpl.java

@@ -580,6 +580,7 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 		shoppingCart.setPrice(productLaunch.getMallPrice());
 		shoppingCart.setProductLaunchId(productLaunch.getId());
 		shoppingCart.setInventory(productLaunch.getInventory());
+		shoppingCart.setTenantId(AuthUtil.getTenantId());
 
 		if (productLaunch.getBillType() == 0) {
 			shoppingCart.setSharedCompanyId(productLaunch.getSalesCompanyId());

+ 1 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -698,6 +698,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				stockDesc.setBrandItem(item.getPattern());
 				stockDesc.setProductDescription(item.getGoodsDescription());
 				stockDesc.setDot(item.getDot());
+				stockDesc.setTenantId(AuthUtil.getTenantId());
 
 				LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 				lambdaQueryWrapper.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())

+ 1 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -99,6 +99,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 			shoppingCart.setCreateUser(AuthUtil.getUserId());
 			shoppingCart.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 			shoppingCart.setCreateTime(new Date());
+			shoppingCart.setTenantId(AuthUtil.getTenantId());
 			baseMapper.insert(shoppingCart);
 		} else {
 			shoppingCart.setUpdateTime(new Date());