lihong 1 year ago
parent
commit
e5be7df519

+ 4 - 2
src/main/java/cn/hnthyy/thmz/controller/zd/JcJyController.java

@@ -1165,8 +1165,10 @@ public class JcJyController {
                     String sampleCode = sampleCodeMap.get(ji.getSampleCode());
                     if (StringUtils.isBlank(sampleCode)) {
                         CodeNameEntity codeNameEntity = mzZdCommonService.queryJySampleByCode(ji.getSampleCode());
-                        sampleCode = codeNameEntity.getName();
-                        sampleCodeMap.put(ji.getSampleCode(), sampleCode);
+                        if(codeNameEntity != null){
+                            sampleCode = codeNameEntity.getName();
+                            sampleCodeMap.put(ji.getSampleCode(), sampleCode);
+                        }
                     }
                     ji.setSampleCode(sampleCode);
                 }

+ 2 - 2
src/main/resources/static/js/dependent/LodopFuncs.js

@@ -84,8 +84,8 @@ function getLodop(oOBJECT, oEMBED) {
                 return;
             }
             if (!LODOP) {
-                driveFile();
-                document.body.innerHTML = strCLodopInstall_1 + (CLodopIsLocal ? strCLodopInstall_2 : "") + strCLodopInstall_3 + document.body.innerHTML;                
+                // driveFile();
+                // document.body.innerHTML = strCLodopInstall_1 + (CLodopIsLocal ? strCLodopInstall_2 : "") + strCLodopInstall_3 + document.body.innerHTML;
                 return;
             } else {
                 if (CLODOP.CVERSION < "3.0.9.1") {