完善

platform-activiti/src/main/java/com/platform/activiti/controller/ActivitiController.java

@@ -21,6 +21,7 @@ import com.platform.common.enums.ResultCode;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.Base64Utils;
+import com.platform.common.util.JsonUtils;
 import com.platform.common.util.R;
 import com.platform.common.util.SecurityUtils;
 import com.platform.common.validation.group.AddGroup;
@@ -466,7 +467,7 @@ public class ActivitiController {
                     String variableName = variable.getVariableName();
                     if ("data".equals(variableName)) {
                         ActApplyInfo applyInfo = (ActApplyInfo)variable.getValue();
-                        log.info(applyInfo.toString());
+                        log.info("applyInfo--------"+ JsonUtils.objectToJson(applyInfo));
                         applyInfo.setProcessInstanceId(task.getProcessInstanceId());
                         applyInfo.setTaskId(task.getId());
                         /**如果是自己发起的，不展示*/

platform-dao/src/main/java/com/platform/dao/vo/query/activiti/ActivitiUserModelVO.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @Description 用户节点模型VO结果类
@@ -118,5 +119,7 @@ public class ActivitiUserModelVO extends BaseVO implements Serializable {
      */
     private String updateUserName;
 
+    private List<String> roleIdsList;
+
 
 }

platform-service/src/main/java/com/platform/service/activiti/impl/ActivitiUserModelServiceImpl.java

@@ -1,5 +1,6 @@
 package com.platform.service.activiti.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.OauthUser;
@@ -72,7 +73,20 @@ public class ActivitiUserModelServiceImpl extends BaseServiceImpl<ActivitiUserMo
 
     @Override
     public ActivitiUserModelVO getVOById(String id) {
-        return mapper.getVOById(id);
+        ActivitiUserModelVO vo = mapper.getVOById(id);
+        if(StringUtils.isNotBlank(vo.getRoleIdList())){
+            List<String> list = JSON.parseArray(vo.getRoleIdList(),String.class);
+            vo.setRoleIdsList(list);
+        }
+        return vo;
+    }
+
+    public static void main(String[] args) {
+        String info = "[\"6103f10e43dc4e57768c3d6f\",\"629f01606f900a18ec66726a\"]";
+        List<String> list = JSON.parseArray(info,String.class);
+        for(String id: list){
+            System.out.println(id);
+        }
     }
 
     @Override

platform-service/src/main/java/com/platform/service/activiti/strategy/ActivitiAssignStrategyAllocateRole.java

@@ -1,6 +1,5 @@
 package com.platform.service.activiti.strategy;
 
-import com.platform.common.exception.BusinessException;
 import com.platform.common.exception.DeniedException;
 import com.platform.dao.dto.upms.SysUserDTO;
 import com.platform.dao.entity.activiti.ActivitiUserModel;

platform-service/src/main/java/com/platform/service/customize/impl/SbStopCheckServiceImpl.java

@@ -81,7 +81,7 @@ public class SbStopCheckServiceImpl extends BaseFormCheckServiceAbstract {
         if (sbScrapForm == null || StringUtils.isBlank(sbScrapForm.getData())) {
             throw new BusinessException("停用单不存在");
         }
-        if (!sbScrapForm.getStatus().equals(CustomFieldTemplateDataStatusEnum.APPLY.getValue())) {
+        if ((!sbScrapForm.getStatus().equals(CustomFieldTemplateDataStatusEnum.APPLY.getValue()) && !sbScrapForm.getStatus().equals(CustomFieldTemplateDataStatusEnum.FAIL.getValue()))) {
             throw new BusinessException("只要待提交状态下的停用单，才可以提交申请");
         }
         SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(sbScrapForm.getObjId());