Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
c412d0e9 by 肖初晴
Options

【DAOP-1.0】企业认证 

【功能点】测试问题处理
1 parent 8a1fdd7a
Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseChangeApproveServiceImpl.java
...@@ -67,6 +67,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -67,6 +67,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
67 67
68 //保存新数据 68 //保存新数据
69 EnterpriseRQVO beanVO = JSON.parseObject(vo.getBizDataJson(), EnterpriseRQVO.class); 69 EnterpriseRQVO beanVO = JSON.parseObject(vo.getBizDataJson(), EnterpriseRQVO.class);
70 String tenantGuid = beanVO.getTenantGuid();
70 MfEnterpriseChangeApprove entity = csbrBeanUtil.convert(beanVO, MfEnterpriseChangeApprove.class); 71 MfEnterpriseChangeApprove entity = csbrBeanUtil.convert(beanVO, MfEnterpriseChangeApprove.class);
71 setEntity(entity,beanVO,vo); 72 setEntity(entity,beanVO,vo);
72 entity.setDataType("2"); 73 entity.setDataType("2");
...@@ -79,6 +80,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -79,6 +80,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
79 setEntity(entity,beanVO,vo); 80 setEntity(entity,beanVO,vo);
80 entity.setDataType("1"); 81 entity.setDataType("1");
81 entity.setGuid(CommonUtil.newGuid()); 82 entity.setGuid(CommonUtil.newGuid());
83 entity.setTenantGuid(tenantGuid);
82 mfEnterpriseChangeApproveService.save(entity); 84 mfEnterpriseChangeApproveService.save(entity);
83 85
84 MfEnterprise bean = mfEnterpriseService.getById(entity.getSourceGuid()); 86 MfEnterprise bean = mfEnterpriseService.getById(entity.getSourceGuid());
......
src/main/java/com/csbr/qingcloud/portal/util/ChangeInfoUtil.java
...@@ -56,8 +56,8 @@ public class ChangeInfoUtil { ...@@ -56,8 +56,8 @@ public class ChangeInfoUtil {
56 vo.setNameEn(diffItem.getFieldName()); 56 vo.setNameEn(diffItem.getFieldName());
57 vo.setName(diffItem.getFieldComment()); 57 vo.setName(diffItem.getFieldComment());
58 vo.setDate(DateUtil.getDateToString(item.oldBean.getCreateTime())); 58 vo.setDate(DateUtil.getDateToString(item.oldBean.getCreateTime()));
59 vo.setBefore(diffItem.getOldValue().toString()); 59 vo.setBefore(diffItem.getOldValue() == null ? "" : diffItem.getOldValue().toString());
60 vo.setAfter(diffItem.getNewValue().toString()); 60 vo.setAfter(diffItem.getNewValue() == null ? "" : diffItem.getNewValue().toString());
61 vo.setGuid(CommonUtil.newGuid()); 61 vo.setGuid(CommonUtil.newGuid());
62 return vo; 62 return vo;
63 } 63 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!