Browse Source

修复大屏查询数据去除逻辑删除的数据

ghost 4 years ago
parent
commit
4763b7d740

+ 2 - 1
forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/listener/PmsProductExcelListener.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.hwrj.cloud.admin.dao.PmsProductExcelDao;
 import com.hwrj.cloud.admin.dto.param.PmsProductExcel;
 import com.hwrj.cloud.admin.dto.param.PmsProductParam;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
 import lombok.SneakyThrows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -109,7 +110,7 @@ public class PmsProductExcelListener extends AnalysisEventListener<PmsProductExc
             //市场价
             pmsProductParam.setOriginalPrice(price);
             //创建人 admin 1
-            pmsProductParam.setCreateUser((long) 1);
+            pmsProductParam.setCreateUser((long) CurrUserUtil.getUserId());
             //创建时间
             pmsProductParam.setCreateTime(new Date());
             list.add(pmsProductParam);

+ 1 - 0
forest-admin/admin-server/src/main/resources/dao/ProductExcelDao.xml

@@ -128,6 +128,7 @@
         pms_product a
         LEFT JOIN pms_product_category b on a.product_category_id=b.id
         WHERE 1=1
+        AND  a.delete_status = 0
     <if test="typeId != null">
         AND b.parent_id = #{typeId}
     </if>