【数据资产】

1、代码回退

@@ -4,7 +4,6 @@ import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO;
 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
 import com.csbr.qingcloud.portal.domain.vo.*;
 import com.csbr.qingcloud.portal.domain.vo.*;
 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
-import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
@@ -70,7 +69,7 @@ public interface EnterpriseService {
      * @return void
      * @return void
      */
      */
     void removeByGuids(List<String> guids);
     void removeByGuids(List<String> guids);
-    
+
     /**
     /**
      * 流程结束后进行业务回调
      * 流程结束后进行业务回调
      * @author xcq
      * @author xcq
@@ -88,6 +87,8 @@ public interface EnterpriseService {
 
 
     Boolean check(EnterpriseRQVO vo);
     Boolean check(EnterpriseRQVO vo);
 
 
+    List<ChangeInfoVO> getChange(String tenantName);
+
     EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
     EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
 
 
     /** 将此账号提交的数据需求迁移到新的企业 */
     /** 将此账号提交的数据需求迁移到新的企业 */

@@ -142,8 +142,8 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
                 if (ObjectUtils.isNotEmpty(mfEnterpriseMap) && mfEnterpriseMap.containsKey(enterpriseApproveRSVO.getBizGuid())) {
                 if (ObjectUtils.isNotEmpty(mfEnterpriseMap) && mfEnterpriseMap.containsKey(enterpriseApproveRSVO.getBizGuid())) {
                     MfEnterprise mfEnterprise = mfEnterpriseMap.get(enterpriseApproveRSVO.getBizGuid());
                     MfEnterprise mfEnterprise = mfEnterpriseMap.get(enterpriseApproveRSVO.getBizGuid());
                     enterpriseApproveRSVO.setCrossPlatformApproveState(mfEnterprise.getCrossPlatformApproveState());
                     enterpriseApproveRSVO.setCrossPlatformApproveState(mfEnterprise.getCrossPlatformApproveState());
+                    enterpriseApproveRSVO.setTenantName(mfEnterprise.getTenantName());
                 }
                 }
-
                 results.add(enterpriseApproveRSVO);
                 results.add(enterpriseApproveRSVO);
             }
             }
 
 
@@ -172,29 +172,22 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME)));
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME)));
         }
         }
         EnterpriseRSVO vo = convertToVO(entity);
         EnterpriseRSVO vo = convertToVO(entity);
-
         //生成变更信息
         //生成变更信息
+        vo.setChangeList(getChange(guid));
+        return vo;
+    }
+
+    /** 生成变更信息列表 */
+    @Override
+    public List<ChangeInfoVO> getChange(String sourceGuid){
         LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, guid);
+        queryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid,sourceGuid);
         queryWrapper.eq(MfEnterpriseChangeApprove::getBizApproveState,ApprovalStateEnum.PASSED.getValue());
         queryWrapper.eq(MfEnterpriseChangeApprove::getBizApproveState,ApprovalStateEnum.PASSED.getValue());
         queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
         queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
         List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
         List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
-
-        if(CollectionUtils.isNotEmpty(approveList)){
-            MfEnterpriseChangeApprove mfEnterpriseChangeApprove = approveList.get(0);
-            EnterpriseRSVO enterpriseRSVO = csbrBeanUtil.convert(mfEnterpriseChangeApprove, EnterpriseRSVO.class);
-            enterpriseRSVO.setChangeList(getChange(approveList));
-            enterpriseRSVO.setApproveVO(vo.getApproveVO());
-            enterpriseRSVO.setBizApproveState(vo.getBizApproveState());
-            return enterpriseRSVO;
+        if(CollectionUtils.isEmpty(approveList)){
+            return new ArrayList<>();
         }
         }
-
-        return vo;
-    }
-
-    /** 生成变更信息列表 */
-    public List<ChangeInfoVO> getChange(List<MfEnterpriseChangeApprove> approveList){
-
         List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
         List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
         try {
         try {
             if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
             if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){