【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -67,6 +67,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
 
         //保存新数据
         EnterpriseRQVO beanVO = JSON.parseObject(vo.getBizDataJson(), EnterpriseRQVO.class);
+        String tenantGuid = beanVO.getTenantGuid();
         MfEnterpriseChangeApprove entity = csbrBeanUtil.convert(beanVO, MfEnterpriseChangeApprove.class);
         setEntity(entity,beanVO,vo);
         entity.setDataType("2");
@@ -79,6 +80,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
         setEntity(entity,beanVO,vo);
         entity.setDataType("1");
         entity.setGuid(CommonUtil.newGuid());
+        entity.setTenantGuid(tenantGuid);
         mfEnterpriseChangeApproveService.save(entity);
 
         MfEnterprise bean = mfEnterpriseService.getById(entity.getSourceGuid());

@@ -56,8 +56,8 @@ public class ChangeInfoUtil {
         vo.setNameEn(diffItem.getFieldName());
         vo.setName(diffItem.getFieldComment());
         vo.setDate(DateUtil.getDateToString(item.oldBean.getCreateTime()));
-        vo.setBefore(diffItem.getOldValue().toString());
-        vo.setAfter(diffItem.getNewValue().toString());
+        vo.setBefore(diffItem.getOldValue() == null ? "" : diffItem.getOldValue().toString());
+        vo.setAfter(diffItem.getNewValue() == null ? "" : diffItem.getNewValue().toString());
         vo.setGuid(CommonUtil.newGuid());
         return vo;
     }