|
@@ -29,6 +29,7 @@ import com.ruoyi.common.constant.StatusConstant;
|
|
|
import com.ruoyi.common.core.domain.BaseIdPo;
|
|
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
+import com.ruoyi.common.core.text.Convert;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
@@ -562,19 +563,19 @@ public class FlowProcessServiceImpl implements FlowProcessService {
|
|
|
}
|
|
|
|
|
|
if (HandleObjectTypeEnum.DETP_LEADER.equals(handleObjectTypeEnum)) {
|
|
|
- Long leaderId = sysDept.getLeaderId();
|
|
|
+ String leaderId = sysDept.getLeaderId();
|
|
|
if (leaderId == null) {
|
|
|
throw new ServiceException("部门负责人为空");
|
|
|
}
|
|
|
- flowResult.setUserId(leaderId);
|
|
|
+ flowResult.setUserId(Convert.toLong(leaderId));
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
- Long directorId = sysDept.getDirectorId();
|
|
|
+ String directorId = sysDept.getDirectorId();
|
|
|
if (directorId == null) {
|
|
|
throw new ServiceException("部门总监为空");
|
|
|
}
|
|
|
- flowResult.setUserId(directorId);
|
|
|
+ flowResult.setUserId(Convert.toLong(directorId));
|
|
|
}
|
|
|
flowResult.setSuccess(true);
|
|
|
return flowResult;
|