소스 검색

bug优化

赵越越 1 주 전
부모
커밋
ecd6a82527

+ 4 - 2
pricing/src/main/java/com/hotent/pricing/manager/impl/FapDocumentRelationManagerImpl.java

@@ -103,8 +103,10 @@ public class FapDocumentRelationManagerImpl extends BaseManagerImpl<FapDocumentR
 
         for (FapDocumentRelation relation : relations) {
             FapPolicyDocument policyDoc = policyDocumentDao.selectById(relation.getPolicyDocId());
-            policyDoc.setIssuingAuthorityName(orgManager.getById(policyDoc.getIssuingAuthority()).getName());
-            policyDocuments.add(policyDoc);
+            if (policyDoc!=null) {
+                policyDoc.setIssuingAuthorityName(orgManager.getById(policyDoc.getIssuingAuthority()).getName());
+                policyDocuments.add(policyDoc);
+            }
         }
         return policyDocuments;
     }

+ 2 - 1
pricing/src/main/java/com/hotent/pricing/manager/impl/FapFeeCatalogManagerImpl.java

@@ -119,7 +119,8 @@ public class FapFeeCatalogManagerImpl extends BaseManagerImpl<FapFeeCatalogDao,
                             .eq(FapFeeStandard::getIsDeleted, "0")
             );
             if (standards != null) {
-                List<FapPolicyDocument> stdocuments = documentRelationManager.getPolicyDocumentsBySource("STANDARD", standards.getId());
+                List<FapPolicyDocument> stdocuments =
+                        documentRelationManager.getPolicyDocumentsBySource("STANDARD", standards.getId());
                 standards.setDocuments(stdocuments);
             }
             String orgId = AuthenticationUtil.getCurrentUserMainOrgId();

+ 1 - 1
pricing/src/main/java/com/hotent/pricing/manager/impl/FapPricingMainManagerImpl.java

@@ -318,7 +318,7 @@ public class FapPricingMainManagerImpl extends BaseManagerImpl<FapPricingMainDao
 					firstRevision.setRevisionStatus("已完成");
 					firstRevision.setEndTime(now);
 					firstRevision.setRemark(remark);
-					firstRevision.setRevisionAttachment(revisionAttachment);
+					firstRevision.setRevisionAttachment(attachment);
 					firstRevisionManager.update(firstRevision);
 				}else{
 					throw new RuntimeException("您当前没有办理权限");