Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/license/update-category/update-category.component.ts

@@ -158,7 +158,7 @@ export class UpdateCategoryComponent implements OnInit {
             let newUrl = window.location.protocol + '//' + window.location.host + body.imageUrl
             body.imageUrl = newUrl
           }
-          if (body.hasAttachmentDefault && body.attachment) {
+          if (body.hasAttachmentDefault && body.attachment && body.attachment.indexOf('http') == -1) {
             let newUrl = window.location.protocol + '//' + window.location.host + body.attachment
             body.attachment = newUrl
           }

src/app/pages/plan-admin/update-license-list/update-license-list.component.html

@@ -81,7 +81,7 @@
                             <ng-container *ngIf="i.value.endDate; else elseTemplate">
                                 <span (click)="lookDetails(i.value)" style="cursor: pointer;"
                                     [ngClass]="{'green': i.value.licenseViolationType == 1,'yellow': i.value.licenseViolationType == 2,'red': i.value.licenseViolationType == 3}">
-                                    {{i.value.endDate | date:"yyyy-MM-dd"}}
+                                    {{i.value.endDate == '9999-12-31T23:59:59.9999999' ? '长期' : i.value.endDate | date:"yyyy-MM-dd"}}
                                 </span>
                             </ng-container>
                             <ng-template #elseTemplate>