数据操作

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -530,6 +530,7 @@ public class TaskController extends BladeController {
 	@ApiOperation(value = "完成/审批任务")
 	public R<Boolean> completeApprovalTask(@RequestBody TaskApprovalVO taskApprovalVO) throws FileNotFoundException {
 		//检查当前用户是否存在等待批次
+		System.out.println(AuthUtil.getUserId());
 		long batchCount = this.taskBatchService.count(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getCreateUser, AuthUtil.getUserId()));
 
 		if(batchCount > 0){

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -329,7 +329,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         return this.baseMapper.queryBatchList(projectId, contract);
     }
 
-    @Async
+    //@Async
     @Override
     public void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS,Long userId) throws FileNotFoundException {
         List<String> taskIds = taskApprovalVOS.stream().map(TaskApprovalVO::getParallelProcessInstanceId).distinct().collect(Collectors.toList());

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -219,6 +219,7 @@ public class EVisaServiceImpl implements EVisaService {
         }
 
         //上锁
+        System.out.println(AuthUtil.getUserId().toString());
         if(DistributedRedisLock.acquire(AuthUtil.getUserId().toString(), batch)){
             try{
                 //准备签章策略

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/EVisaConfigClientImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.manager.dto.SaveUserInfoByProjectDTO;
 import org.springblade.manager.entity.TextdictInfo;
 import org.springblade.manager.service.ITextdictInfoService;
@@ -48,6 +49,8 @@ public class EVisaConfigClientImpl implements EVisaConfigClient {
 
         } else {
             //需要获取这条任务对应合同段下当前用户的岗位
+            System.out.println(AuthUtil.getUserId());
+            System.out.println(SecureUtil.getUserId());
             List<SaveUserInfoByProjectDTO> contractUserList = this.saveUserInfoByProjectService.list(Wrappers.<SaveUserInfoByProjectDTO>lambdaQuery().eq(SaveUserInfoByProjectDTO::getContractId, contractId).eq(SaveUserInfoByProjectDTO::getUserId, AuthUtil.getUserId()));
 
             List<String> userRoleList;
@@ -64,7 +67,8 @@ public class EVisaConfigClientImpl implements EVisaConfigClient {
             configResult.forEach(config -> {
                 JSONObject jsonObject = new JSONObject();
                 //标识
-                jsonObject.put("KEY", Boolean.parseBoolean(isFinal) ? config.getColName() : config.getId());
+               // jsonObject.put("KEY", Boolean.parseBoolean(isFinal) ? config.getColName() : config.getId());
+                jsonObject.put("KEY", config.getId());
                 if(Boolean.parseBoolean(isFinal)){
                     jsonObject.put("type", config.getSigRoleId());
                 }