【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -5,12 +5,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.csbr.cloud.common.entity.RedisStaffPOJO;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
 import com.csbr.cloud.common.exception.CsbrSystemException;
 import com.csbr.cloud.common.exception.CsbrSystemException;
 import com.csbr.cloud.common.util.CommonUtil;
 import com.csbr.cloud.common.util.CommonUtil;
 import com.csbr.cloud.common.util.CsbrBeanUtil;
 import com.csbr.cloud.common.util.CsbrBeanUtil;
 import com.csbr.cloud.common.util.MessageSourceUtil;
 import com.csbr.cloud.common.util.MessageSourceUtil;
+import com.csbr.cloud.distributelock.util.RedisUtil;
 import com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO;
 import com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO;
 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;
@@ -37,7 +39,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
@@ -72,6 +73,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     private PersonelFeign personelFeign;
     private PersonelFeign personelFeign;
 
 
     @Resource
     @Resource
+    private RedisUtil redisUtil;
+
+    @Resource
     private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
     private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
 
 
     @Resource
     @Resource
@@ -439,11 +443,11 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
      * @date 2024-12-26 16:18
      * @date 2024-12-26 16:18
      */
      */
     private AddApprovalDTO getAddApprovalDTO(MfEnterprise entity, EnterpriseRQVO rqVO) {
     private AddApprovalDTO getAddApprovalDTO(MfEnterprise entity, EnterpriseRQVO rqVO) {
+        RedisStaffPOJO staffPOJO = redisUtil.getRedisStaff();
         AddApprovalDTO approvalDTO = new AddApprovalDTO(WorkFlowBizEnum.ENTERPRISE_APPLY.getValue(), entity.getGuid());
         AddApprovalDTO approvalDTO = new AddApprovalDTO(WorkFlowBizEnum.ENTERPRISE_APPLY.getValue(), entity.getGuid());
-        // todo
         approvalDTO.setFuncCode("QYRZ");
         approvalDTO.setFuncCode("QYRZ");
         approvalDTO.setUrlParam(String.format("guid=%s&name=%s&tName=%s&fType=%s&bizGuid=%s",entity.getGuid(), entity.getTenantName(),
         approvalDTO.setUrlParam(String.format("guid=%s&name=%s&tName=%s&fType=%s&bizGuid=%s",entity.getGuid(), entity.getTenantName(),
-                entity.getTenantName(),WorkFlowBizEnum.ENTERPRISE_APPLY.getValue(),entity.getGuid()));
+                staffPOJO.getTenantName(),WorkFlowBizEnum.ENTERPRISE_APPLY.getValue(),entity.getGuid()));
         // 流程消息中的变量替换参数
         // 流程消息中的变量替换参数
         approvalDTO.setFlowMessageBody(String.format("%s", entity.getTenantName()));
         approvalDTO.setFlowMessageBody(String.format("%s", entity.getTenantName()));
         // 流程列表数据核心param参数处理
         // 流程列表数据核心param参数处理
@@ -459,6 +463,8 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         return approvalDTO;
         return approvalDTO;
     }
     }
 
 
+
+
     /**
     /**
      * 企业信息新新增前置处理
      * 企业信息新新增前置处理
      * @author xcq
      * @author xcq