Merge branch 'developer' into 'master'

小程序二维码修改

See merge request !32

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java

@@ -611,9 +611,11 @@ public class EnterpriseController {
         if (CollectionUtils.isNotEmpty(orderVOList)) {
             for (OrderVO orderVO : orderVOList) {
                 EnterpriseDTO enterpriseDTO = enterpriseInfoMap.get(orderVO.getEnterpriseId().intValue());
-                orderVO.setCompanyName(enterpriseDTO.getCompanyName());
-                orderVO.setLogo(enterpriseDTO.getLogo());
-                orderVO.setApprover(approvalInfoMap.get(orderVO.getOrderNum()));
+                if(enterpriseDTO != null){
+                    orderVO.setCompanyName(enterpriseDTO.getCompanyName());
+                    orderVO.setLogo(enterpriseDTO.getLogo());
+                    orderVO.setApprover(approvalInfoMap.get(orderVO.getOrderNum()));
+                }
             }
         }
         resultPage.setResult(orderVOList);