Merge remote-tracking branch 'origin/develop' into develop

@@ -4,6 +4,7 @@ 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;
@@ -87,8 +88,6 @@ public interface EnterpriseService {
 
 
     Boolean check(EnterpriseRQVO vo);
     Boolean check(EnterpriseRQVO vo);
 
 
-    List<ChangeInfoVO> getChange(String tenantName);
-
     EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
     EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
 
 
     /** 将此账号提交的数据需求迁移到新的企业 */
     /** 将此账号提交的数据需求迁移到新的企业 */

@@ -174,21 +174,27 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         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,sourceGuid);
+        queryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, guid);
         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.isEmpty(approveList)){
-            return new ArrayList<>();
+
+        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;
         }
         }
+
+        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)){