From e3a44174eaa6209ecf79cfcd9f10aa02ebf787ff Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 04 十一月 2025 11:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
index 5bbad6d..ed4910b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
@@ -125,6 +125,10 @@
             if(tErpGoodsVO.getIsPrescriptionDrug()!=null && tErpGoodsVO.getIsPrescriptionDrug()==3){
                 tErpGoodsVO.setIsPrescriptionDrug(null);
             }
+
+            if(user.getRoleType()==5 && (tErpGoodsVO.getContentState()==null || tErpGoodsVO.getContentState()!=1)){
+                tErpGoodsVO.setContent(null);
+            }
         }
 
         pageInfo.setRecords(list);

--
Gitblit v1.7.1