diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java index 8891abda7..5a1049cec 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java @@ -15,6 +15,7 @@ public interface BpmErrorCodeConstants { // ========== OA 流程模块 1-003-001-000 ========== + // TODO @jason:前缀 ErrorCode LEAVE_NOT_EXISTS = new ErrorCode(1003001001, "请假申请不存在"); ErrorCode PM_POST_NOT_EXISTS = new ErrorCode(1003001002, "项目经理岗位未设置"); ErrorCode DEPART_PM_POST_NOT_EXISTS = new ErrorCode(1003001003, "部门的项目经理不存在"); @@ -23,6 +24,4 @@ public interface BpmErrorCodeConstants { ErrorCode HR_POST_NOT_EXISTS = new ErrorCode(1003001006, "HR岗位未设置"); ErrorCode DAY_LEAVE_ERROR = new ErrorCode(1003001007, "请假天数必须>=1"); - - } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/BpmTaskService.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/BpmTaskService.java index b13db0671..07d1f7f52 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/BpmTaskService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/BpmTaskService.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.adminserver.modules.bpm.service.workflow; import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -17,14 +16,12 @@ public interface BpmTaskService { */ PageResult getTodoTaskPage(TodoTaskPageReqVO pageReqVO); - /** * 签收任务 * @param taskId 用户任务id */ void claimTask(String taskId); - /** * 工作流,完成 userTask, 完成用户任务 一般传入参数 1。是否同意(variables). 2. 评论(comment) * variables 变量名 和 评论 由前台传入 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/user/SysUserMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/user/SysUserMapper.java index ee5969ae9..e1426c472 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/user/SysUserMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/user/SysUserMapper.java @@ -1,21 +1,19 @@ package cn.iocoder.yudao.adminserver.modules.system.dal.mysql.user; -import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserBaseVO; +import cn.hutool.core.util.StrUtil; +import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserExportReqVO; +import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserPageReqVO; import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; -import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserExportReqVO; -import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserPageReqVO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.logging.log4j.util.Strings; import java.util.Collection; import java.util.List; import java.util.Optional; -import java.util.Set; @Mapper public interface SysUserMapper extends BaseMapperX { @@ -62,6 +60,7 @@ public interface SysUserMapper extends BaseMapperX { return selectList(new QueryWrapperX() .eq("status", CommonStatusEnum.ENABLE.getStatus()) .eq("dept_id", departId) + // TODO @jason: 封装一个 StringUtils .toString 。如果空的时候,设置为 null。会更简洁 .likeIfPresent("post_ids", Optional.ofNullable(postId).map(t -> String.valueOf(postId)).orElse(""))); }