修改代码

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -278,6 +278,11 @@ public class EmployeesServiceImpl implements IEmployeesService {
         return baseMapper.updateById(BeanUtil.toBean(employeesVo, Employees.class)) > 0;
         return baseMapper.updateById(BeanUtil.toBean(employeesVo, Employees.class)) > 0;
     }
     }
 
 
+    @Override
+    public EmployeesVo queryByUserId(Long userId) {
+        return baseMapper.selectVoOne(Wrappers.<Employees>lambdaQuery().eq(Employees::getUid, userId));
+    }
+
     /**
     /**
      * 保存前的数据校验
      * 保存前的数据校验
      */
      */

pz-system/src/main/java/com/pz/system/domain/bo/StoreGoodsBo.java

@@ -4,6 +4,7 @@ import com.pz.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 import javax.validation.constraints.*;
+import java.util.List;
 
 
 
 
 /**
 /**
@@ -38,9 +39,9 @@ public class StoreGoodsBo extends BaseEntity {
     private String title;
     private String title;
 
 
     /**
     /**
-     * 标签
+     * 标签集
      */
      */
-    private String tags;
+    private List<Integer> tagIds;
 
 
     /**
     /**
      * 原价
      * 原价

pz-system/src/main/java/com/pz/system/domain/vo/StoreGoodsVo.java

@@ -107,4 +107,6 @@ public class StoreGoodsVo {
     private Integer saleNum;
     private Integer saleNum;
 
 
     private List<Carousel> carousel;
     private List<Carousel> carousel;
+
+    private List<Integer> ids;
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/StoreGoodsServiceImpl.java

 package com.pz.system.service.impl;
 package com.pz.system.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSONArray;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.common.utils.JsonUtils;
 import com.pz.system.domain.StoreApply;
 import com.pz.system.domain.StoreApply;
 import com.pz.system.domain.vo.StoreApplyVo;
 import com.pz.system.domain.vo.StoreApplyVo;
 import com.pz.system.mapper.StoreApplyMapper;
 import com.pz.system.mapper.StoreApplyMapper;
@@ -70,7 +73,11 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
         Page<StoreGoodsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Page<StoreGoodsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Optional.ofNullable(result.getRecords()).ifPresent(storeGoodsVos -> {
         Optional.ofNullable(result.getRecords()).ifPresent(storeGoodsVos -> {
             storeGoodsVos.forEach(storeGoodsVo -> {
             storeGoodsVos.forEach(storeGoodsVo -> {
+                if (StringUtils.isNotBlank(storeGoodsVo.getTags())) {
+                    List<Integer> ids = JsonUtils.parseArray(storeGoodsVo.getTags(), Integer.class);
 
 
+                    storeGoodsVo.setIds(ids);
+                }
             });
             });
         });
         });
         return TableDataInfo.build(result);
         return TableDataInfo.build(result);
@@ -120,7 +127,6 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
         lqw.eq(bo.getCityId() != null, StoreGoods::getCityId, bo.getCityId());
         lqw.eq(bo.getCityId() != null, StoreGoods::getCityId, bo.getCityId());
         lqw.eq(bo.getStoreId() != null, StoreGoods::getStoreId, bo.getStoreId());
         lqw.eq(bo.getStoreId() != null, StoreGoods::getStoreId, bo.getStoreId());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), StoreGoods::getTitle, bo.getTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), StoreGoods::getTitle, bo.getTitle());
-        lqw.eq(StringUtils.isNotBlank(bo.getTags()), StoreGoods::getTags, bo.getTags());
         lqw.eq(StringUtils.isNotBlank(bo.getPrice()), StoreGoods::getPrice, bo.getPrice());
         lqw.eq(StringUtils.isNotBlank(bo.getPrice()), StoreGoods::getPrice, bo.getPrice());
         lqw.eq(StringUtils.isNotBlank(bo.getSalePrice()), StoreGoods::getSalePrice, bo.getSalePrice());
         lqw.eq(StringUtils.isNotBlank(bo.getSalePrice()), StoreGoods::getSalePrice, bo.getSalePrice());
         lqw.eq(StringUtils.isNotBlank(bo.getSmallCover()), StoreGoods::getSmallCover, bo.getSmallCover());
         lqw.eq(StringUtils.isNotBlank(bo.getSmallCover()), StoreGoods::getSmallCover, bo.getSmallCover());
@@ -139,7 +145,10 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
     @Override
     @Override
     public Boolean insertByBo(StoreGoodsBo bo) {
     public Boolean insertByBo(StoreGoodsBo bo) {
         StoreGoods add = BeanUtil.toBean(bo, StoreGoods.class);
         StoreGoods add = BeanUtil.toBean(bo, StoreGoods.class);
-        validEntityBeforeSave(add);
+        if (CollectionUtils.isNotEmpty(bo.getTagIds())) {
+            String tags = JsonUtils.toJsonString(bo.getTagIds());
+            add.setTags(tags);
+        }
         boolean flag = baseMapper.insert(add) > 0;
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
         if (flag) {
             bo.setId(add.getId());
             bo.setId(add.getId());