cxd 6 månader sedan
förälder
incheckning
fc3a7b1bab

+ 9 - 4
gqy-system/src/main/java/com/gqy/document/service/impl/DcDocumentServiceImpl.java

@@ -61,10 +61,15 @@ public class DcDocumentServiceImpl implements IDocumentService
         PageHelper.startPage(page, pageSize);
         List<DcDocument> list = documentMapper.selectDcDocumentList(dcDocument);
         //isContentShow   true 显示 false 不显现
-        boolean isContentShow = (boolean)maps.get("isContentShow");
-        if(!isContentShow){
-            for(DcDocument dcDocument1 : list){
-                dcDocument1.setDcm_data("");
+        boolean isContentShow = false;
+        if (maps != null && maps.get("isContentShow") != null) {
+            isContentShow = (boolean) maps.get("isContentShow");
+        }
+        if (!isContentShow && list != null) {
+            for (DcDocument dcDocument1 : list) {
+                if (dcDocument1 != null) {
+                    dcDocument1.setDcm_data("");
+                }
             }
         }
 

+ 9 - 4
gqy-system/src/main/java/com/gqy/document/service/impl/DcbBlockServiceImpl.java

@@ -37,11 +37,16 @@ public class DcbBlockServiceImpl implements IDcbBlockService {
 
         List<DcbBlock> list = dcbBlockMapper.selectDcbBlockList(dcbBlock);
         //isContentShow   true 显示 false 不显现
-        boolean isContentShow = (boolean) maps.get("isContentShow");
-        if (!isContentShow){
+        boolean isContentShow = false;
+        if (maps != null && maps.get("isContentShow") != null) {
+            isContentShow = (boolean) maps.get("isContentShow");
+        }
+        if (!isContentShow && list != null) {
             for (DcbBlock block : list) {
-                block.setDcb_nr("");
-                block.setDcb_attrs("");
+                if (block != null) {
+                    block.setDcb_nr("");
+                    block.setDcb_attrs("");
+                }
             }
         }
         PageInfo<DcbBlock> pageInfo = new PageInfo<>(list);