产品库添加业务员

hx-item/src/main/java/com/fjhx/item/entity/product/po/ProductInfo.java

@@ -231,4 +231,9 @@ public class ProductInfo extends BasePo {
      * 业务成本单价
      */
     private BigDecimal businessCostPrice;
+
+    /**
+     * 业务员id
+     */
+    private Long saleUserId;
 }

hx-item/src/main/java/com/fjhx/item/entity/product/vo/ProductInfoVo.java

@@ -89,4 +89,6 @@ public class ProductInfoVo extends ProductInfo {
      * 有属性原材料名称
      */
     private String attrRawMaterialName;
+
+    private String saleUserName;
 }

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -50,6 +50,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -164,6 +165,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         this.attributeAssign(records, ProductInfo::getAttrRawMaterialId, (item, product) -> {
             item.setAttrRawMaterialName(product.getName());
         });
+
+        //赋值业务员
+        UserUtil.assignmentNickName(records, ProductInfoVo::getSaleUserId, ProductInfoVo::setSaleUserName);
     }
 
     private IWrapper<ProductInfo> getPageWrapper(ProductInfoSelectDto dto) {
@@ -222,6 +226,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             wrapper.and(q1 -> q1.
                     and(q -> q.eq("pi", ProductInfo::getDefinition, 1)
                             .in("pi", ProductInfo::getCompanyId, SecurityUtils.getCompanyIds())
+                            .and(q2 -> q2.eq("pi", ProductInfo::getSaleUserId, SecurityUtils.getUserId()).or().isNull("pi.sale_user_id"))
                     )
                     .or().eq("pi", ProductInfo::getDefinition, 2)
             );
@@ -237,6 +242,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         ProductInfo productInfo = this.getById(id);
         ProductInfoVo result = BeanUtil.toBean(productInfo, ProductInfoVo.class);
 
+        //赋值详情
+        setPageInfo(Collections.singletonList(result));
+
         //赋值分类名称
         ProductClassify productClassify = productClassifyService.getById(result.getProductClassifyId());
         if (ObjectUtil.isNotEmpty(productClassify)) {

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -50,7 +50,8 @@
                pi.color_count,
                pi.is_fold,
                pi.pack_ask,
-               pi.is_customized
+               pi.is_customized,
+               pi.sale_user_id
         FROM product_info pi
                  LEFT JOIN (SELECT IF(SUM(IF(type = 1, 1, 0)) > 0, 1, 0) AS isRawMaterial,
                                    pbd.product_id