Merge remote-tracking branch 'origin/master'

xuhy

2025-11-04 e3a44174eaa6209ecf79cfcd9f10aa02ebf787ff

 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);