zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

Browse Source
This commit is contained in:
王兴荣
2025-12-25 15:12:26 +08:00
parent 69a3f75f89 58f9c9a350
commit 635c30f850
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java
View File

@@ -121,6 +121,9 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
JSONObject dataJson = JSONObject.parseObject(documentContent); JSONObject dataJson = JSONObject.parseObject(documentContent);
if(dataJson == null) if(dataJson == null)
continue; continue;
String usage = dataJson.getString("usage");
if(!"report".equals( usage) && ! "ingredient_report".equals(usage))
continue;
if(dataJson.containsKey(field)){ if(dataJson.containsKey(field)){
if(!hasFields.contains( fieldName)){ if(!hasFields.contains( fieldName)){
fieldList.add(fieldDO); fieldList.add(fieldDO);