BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 5efb4c26cd565ed5f75efe7fcfc510151d23376e

Authored by YunaiV
1 parent 33ab2e96

【新增】工作组，用于支持指定工作组进行任务的审批

Inline Side-by-side
Showing 22 changed files with 885 additions and 8 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmUserGroupController.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition;
  2 +
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupRespVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupConvert;
  8 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;
  9 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
  10 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  11 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  12 +import io.swagger.annotations.Api;
  13 +import io.swagger.annotations.ApiImplicitParam;
  14 +import io.swagger.annotations.ApiOperation;
  15 +import org.springframework.security.access.prepost.PreAuthorize;
  16 +import org.springframework.validation.annotation.Validated;
  17 +import org.springframework.web.bind.annotation.*;
  18 +
  19 +import javax.annotation.Resource;
  20 +import javax.validation.Valid;
  21 +
  22 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  23 +
  24 +@Api(tags = "用户组")
  25 +@RestController
  26 +@RequestMapping("/bpm/user-group")
  27 +@Validated
  28 +public class BpmUserGroupController {
  29 +
  30 + @Resource
  31 + private BpmUserGroupService userGroupService;
  32 +
  33 + @PostMapping("/create")
  34 + @ApiOperation("创建用户组")
  35 + @PreAuthorize("@ss.hasPermission('bpm:user-group:create')")
  36 + public CommonResult<Long> createUserGroup(@Valid @RequestBody BpmUserGroupCreateReqVO createReqVO) {
  37 + return success(userGroupService.createUserGroup(createReqVO));
  38 + }
  39 +
  40 + @PutMapping("/update")
  41 + @ApiOperation("更新用户组")
  42 + @PreAuthorize("@ss.hasPermission('bpm:user-group:update')")
  43 + public CommonResult<Boolean> updateUserGroup(@Valid @RequestBody BpmUserGroupUpdateReqVO updateReqVO) {
  44 + userGroupService.updateUserGroup(updateReqVO);
  45 + return success(true);
  46 + }
  47 +
  48 + @DeleteMapping("/delete")
  49 + @ApiOperation("删除用户组")
  50 + @ApiImplicitParam(name = "id", value = "编号", required = true)
  51 + @PreAuthorize("@ss.hasPermission('bpm:user-group:delete')")
  52 + public CommonResult<Boolean> deleteUserGroup(@RequestParam("id") Long id) {
  53 + userGroupService.deleteUserGroup(id);
  54 + return success(true);
  55 + }
  56 +
  57 + @GetMapping("/get")
  58 + @ApiOperation("获得用户组")
  59 + @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
  60 + @PreAuthorize("@ss.hasPermission('bpm:user-group:query')")
  61 + public CommonResult<BpmUserGroupRespVO> getUserGroup(@RequestParam("id") Long id) {
  62 + BpmUserGroupDO userGroup = userGroupService.getUserGroup(id);
  63 + return success(BpmUserGroupConvert.INSTANCE.convert(userGroup));
  64 + }
  65 +
  66 + @GetMapping("/page")
  67 + @ApiOperation("获得用户组分页")
  68 + @PreAuthorize("@ss.hasPermission('bpm:user-group:query')")
  69 + public CommonResult<PageResult<BpmUserGroupRespVO>> getUserGroupPage(@Valid BpmUserGroupPageReqVO pageVO) {
  70 + PageResult<BpmUserGroupDO> pageResult = userGroupService.getUserGroupPage(pageVO);
  71 + return success(BpmUserGroupConvert.INSTANCE.convertPage(pageResult));
  72 + }
  73 +
  74 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupBaseVO.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.annotations.*;
  6 +import javax.validation.constraints.*;
  7 +
  8 +/**
  9 +* 用户组 Base VO，提供给添加、修改、详细的子 VO 使用
  10 +* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 +*/
  12 +@Data
  13 +public class BpmUserGroupBaseVO {
  14 +
  15 + @ApiModelProperty(value = "组名", required = true, example = "芋道")
  16 + @NotNull(message = "组名不能为空")
  17 + private String name;
  18 +
  19 + @ApiModelProperty(value = "描述", required = true, example = "芋道源码")
  20 + @NotNull(message = "描述不能为空")
  21 + private String description;
  22 +
  23 + @ApiModelProperty(value = "成员编号数组", required = true, example = "1,2,3")
  24 + @NotNull(message = "成员编号数组不能为空")
  25 + private Set<Long> memberUserIds;
  26 +
  27 + @ApiModelProperty(value = "状态", required = true, example = "1")
  28 + @NotNull(message = "状态不能为空")
  29 + private Integer status;
  30 +
  31 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupCreateReqVO.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.annotations.*;
  6 +import javax.validation.constraints.*;
  7 +
  8 +@ApiModel("用户组创建 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +@ToString(callSuper = true)
  12 +public class BpmUserGroupCreateReqVO extends BpmUserGroupBaseVO {
  13 +
  14 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupPageReqVO.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.annotations.*;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +
  9 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  10 +
  11 +@ApiModel("用户组分页 Request VO")
  12 +@Data
  13 +@EqualsAndHashCode(callSuper = true)
  14 +@ToString(callSuper = true)
  15 +public class BpmUserGroupPageReqVO extends PageParam {
  16 +
  17 + @ApiModelProperty(value = "组名", example = "芋道")
  18 + private String name;
  19 +
  20 + @ApiModelProperty(value = "状态", example = "1")
  21 + private Integer status;
  22 +
  23 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  24 + @ApiModelProperty(value = "开始创建时间")
  25 + private Date beginCreateTime;
  26 +
  27 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  28 + @ApiModelProperty(value = "结束创建时间")
  29 + private Date endCreateTime;
  30 +
  31 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupRespVO.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.annotations.*;
  6 +
  7 +@ApiModel("用户组 Response VO")
  8 +@Data
  9 +@EqualsAndHashCode(callSuper = true)
  10 +@ToString(callSuper = true)
  11 +public class BpmUserGroupRespVO extends BpmUserGroupBaseVO {
  12 +
  13 + @ApiModelProperty(value = "编号", required = true, example = "1024")
  14 + private Long id;
  15 +
  16 + @ApiModelProperty(value = "创建时间", required = true)
  17 + private Date createTime;
  18 +
  19 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupUpdateReqVO.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.annotations.*;
  6 +import javax.validation.constraints.*;
  7 +
  8 +@ApiModel("用户组更新 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +@ToString(callSuper = true)
  12 +public class BpmUserGroupUpdateReqVO extends BpmUserGroupBaseVO {
  13 +
  14 + @ApiModelProperty(value = "编号", required = true, example = "1024")
  15 + @NotNull(message = "编号不能为空")
  16 + private Long id;
  17 +
  18 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmUserGroupConvert.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition;
  2 +
  3 +import java.util.*;
  4 +
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupRespVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  8 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;
  9 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  10 +
  11 +import org.mapstruct.Mapper;
  12 +import org.mapstruct.factory.Mappers;
  13 +
  14 +/**
  15 + * 用户组 Convert
  16 + *
  17 + * @author 芋道源码
  18 + */
  19 +@Mapper
  20 +public interface BpmUserGroupConvert {
  21 +
  22 + BpmUserGroupConvert INSTANCE = Mappers.getMapper(BpmUserGroupConvert.class);
  23 +
  24 + BpmUserGroupDO convert(BpmUserGroupCreateReqVO bean);
  25 +
  26 + BpmUserGroupDO convert(BpmUserGroupUpdateReqVO bean);
  27 +
  28 + BpmUserGroupRespVO convert(BpmUserGroupDO bean);
  29 +
  30 + List<BpmUserGroupRespVO> convertList(List<BpmUserGroupDO> list);
  31 +
  32 + PageResult<BpmUserGroupRespVO> convertPage(PageResult<BpmUserGroupDO> page);
  33 +
  34 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java
  View file @5efb4c2
... ... @@ -74,7 +74,7 @@ public class BpmTaskAssignRuleDO extends BaseDO {
74 74 * 根据 type 不同，对应的值是不同的：
75 75 *
76 76 * 1. {@link BpmTaskAssignRuleTypeEnum#ROLE} 时：角色编号
77   - * 2. {@link BpmTaskAssignRuleTypeEnum#DEPT} 时：部门编号
  77 + * 2. {@link BpmTaskAssignRuleTypeEnum#DEPT_MEMBER} 时：部门编号
78 78 * 3. {@link BpmTaskAssignRuleTypeEnum#DEPT_LEADER} 时：部门编号
79 79 * 4. {@link BpmTaskAssignRuleTypeEnum#USER} 时：用户编号
80 80 * 5. {@link BpmTaskAssignRuleTypeEnum#USER_GROUP} 时：用户组编号
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmUserGroupDO.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler;
  6 +import com.baomidou.mybatisplus.annotation.TableField;
  7 +import com.baomidou.mybatisplus.annotation.TableId;
  8 +import com.baomidou.mybatisplus.annotation.TableName;
  9 +import lombok.*;
  10 +
  11 +import java.util.Set;
  12 +
  13 +/**
  14 + * Bpm 用户组
  15 + *
  16 + * @author 芋道源码
  17 + */
  18 +@TableName(value = "bpm_user_group", autoResultMap = true)
  19 +@Data
  20 +@EqualsAndHashCode(callSuper = true)
  21 +@ToString(callSuper = true)
  22 +@Builder
  23 +@NoArgsConstructor
  24 +@AllArgsConstructor
  25 +public class BpmUserGroupDO extends BaseDO {
  26 +
  27 + /**
  28 + * 编号，自增
  29 + */
  30 + @TableId
  31 + private Long id;
  32 + /**
  33 + * 组名
  34 + */
  35 + private String name;
  36 + /**
  37 + * 描述
  38 + */
  39 + private String description;
  40 + /**
  41 + * 状态
  42 + *
  43 + * 枚举 {@link CommonStatusEnum}
  44 + */
  45 + private Integer status;
  46 + /**
  47 + * 成员用户编号数组
  48 + */
  49 + @TableField(typeHandler = JsonLongSetTypeHandler.class)
  50 + private Set<Long> memberUserIds;
  51 +
  52 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmUserGroupMapper.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition;
  2 +
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  7 +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +/**
  11 + * 用户组 Mapper
  12 + *
  13 + * @author 芋道源码
  14 + */
  15 +@Mapper
  16 +public interface BpmUserGroupMapper extends BaseMapperX<BpmUserGroupDO> {
  17 +
  18 + default PageResult<BpmUserGroupDO> selectPage(BpmUserGroupPageReqVO reqVO) {
  19 + return selectPage(reqVO, new QueryWrapperX<BpmUserGroupDO>()
  20 + .likeIfPresent("name", reqVO.getName())
  21 + .eqIfPresent("status", reqVO.getStatus())
  22 + .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  23 + .orderByDesc("id"));
  24 + }
  25 +
  26 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java
  View file @5efb4c2
... ... @@ -52,4 +52,6 @@ public interface BpmErrorCodeConstants {
52 52 ErrorCode FORM_NOT_EXISTS = new ErrorCode(1009010000, "动态表单不存在");
53 53 ErrorCode FORM_FIELD_REPEAT = new ErrorCode(1009010000, "表单项({}) 和 ({}) 使用了相同的字段名({})");
54 54  
  55 + // ========== 用户组模块 1-009-011-000 ==========
  56 + ErrorCode USER_GROUP_NOT_EXISTS = new ErrorCode(1009011000, "用户组不存在");
55 57 }
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java
  View file @5efb4c2
... ... @@ -14,12 +14,12 @@ public enum BpmTaskAssignRuleTypeEnum {
14 14  
15 15 ROLE(10, "角色"),
16 16  
17   - DEPT(20, "部门的成员"),
  17 + DEPT_MEMBER(20, "部门的成员"), // 包括负责人
18 18 DEPT_LEADER(21, "部门的负责人"),
19 19  
20 20 USER(30, "用户"),
21 21  
22   - USER_GROUP(40, "用户组"), // TODO 芋艿：预留，暂未实现
  22 + USER_GROUP(40, "用户组"),
23 23  
24 24 SCRIPT(50, "自定义脚本"), // 例如说，发起人所在部门的领导、发起人所在部门的领导的领导
25 25 ;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehavior.java
  View file @5efb4c2
... ... @@ -79,7 +79,7 @@ public class BpmUserTaskActivitiBehavior extends UserTaskActivityBehavior {
79 79 Set<Long> assigneeUserIds = null;
80 80 if (Objects.equals(BpmTaskAssignRuleTypeEnum.ROLE.getType(), rule.getType())) {
81 81 assigneeUserIds = calculateTaskCandidateUsersByRole(task, rule);
82   - } else if (Objects.equals(BpmTaskAssignRuleTypeEnum.DEPT.getType(), rule.getType())) {
  82 + } else if (Objects.equals(BpmTaskAssignRuleTypeEnum.DEPT_MEMBER.getType(), rule.getType())) {
83 83 assigneeUserIds = calculateTaskCandidateUsersByDept(task, rule);
84 84 } else if (Objects.equals(BpmTaskAssignRuleTypeEnum.DEPT_LEADER.getType(), rule.getType())) {
85 85 assigneeUserIds = calculateTaskCandidateUsersByDept(task, rule);
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmUserGroupService.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
  2 +
  3 +import java.util.*;
  4 +import javax.validation.*;
  5 +
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  8 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  9 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;
  10 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  11 +
  12 +/**
  13 + * 用户组 Service 接口
  14 + *
  15 + * @author 芋道源码
  16 + */
  17 +public interface BpmUserGroupService {
  18 +
  19 + /**
  20 + * 创建用户组
  21 + *
  22 + * @param createReqVO 创建信息
  23 + * @return 编号
  24 + */
  25 + Long createUserGroup(@Valid BpmUserGroupCreateReqVO createReqVO);
  26 +
  27 + /**
  28 + * 更新用户组
  29 + *
  30 + * @param updateReqVO 更新信息
  31 + */
  32 + void updateUserGroup(@Valid BpmUserGroupUpdateReqVO updateReqVO);
  33 +
  34 + /**
  35 + * 删除用户组
  36 + *
  37 + * @param id 编号
  38 + */
  39 + void deleteUserGroup(Long id);
  40 +
  41 + /**
  42 + * 获得用户组
  43 + *
  44 + * @param id 编号
  45 + * @return 用户组
  46 + */
  47 + BpmUserGroupDO getUserGroup(Long id);
  48 +
  49 + /**
  50 + * 获得用户组列表
  51 + *
  52 + * @param ids 编号
  53 + * @return 用户组列表
  54 + */
  55 + List<BpmUserGroupDO> getUserGroupList(Collection<Long> ids);
  56 +
  57 + /**
  58 + * 获得用户组分页
  59 + *
  60 + * @param pageReqVO 分页查询
  61 + * @return 用户组分页
  62 + */
  63 + PageResult<BpmUserGroupDO> getUserGroupPage(BpmUserGroupPageReqVO pageReqVO);
  64 +
  65 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmTaskAssignRuleServiceImpl.java
  View file @5efb4c2
... ... @@ -19,7 +19,6 @@ import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
19 19 import lombok.extern.slf4j.Slf4j;
20 20 import org.activiti.bpmn.model.BpmnModel;
21 21 import org.activiti.bpmn.model.UserTask;
22   -import org.activiti.engine.repository.ProcessDefinition;
23 22 import org.springframework.context.annotation.Lazy;
24 23 import org.springframework.stereotype.Service;
25 24 import org.springframework.validation.annotation.Validated;
... ... @@ -29,7 +28,6 @@ import java.util.Collections;
29 28 import java.util.List;
30 29 import java.util.Objects;
31 30 import java.util.Set;
32   -import java.util.function.Consumer;
33 31  
34 32 import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.*;
35 33 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
... ... @@ -145,7 +143,7 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
145 143 private void validTaskAssignRuleOptions(Integer type, Set<Long> options) {
146 144 if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.ROLE.getType())) {
147 145 roleService.validRoles(options);
148   - } else if (ObjectUtils.equalsAny(BpmTaskAssignRuleTypeEnum.DEPT.getType(),
  146 + } else if (ObjectUtils.equalsAny(BpmTaskAssignRuleTypeEnum.DEPT_MEMBER.getType(),
149 147 BpmTaskAssignRuleTypeEnum.DEPT_LEADER.getType())) {
150 148 deptService.validDepts(options);
151 149 }
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmUserGroupServiceImpl.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl;
  2 +
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupConvert;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;
  8 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmUserGroupMapper;
  9 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
  10 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  11 +import org.springframework.stereotype.Service;
  12 +import org.springframework.validation.annotation.Validated;
  13 +
  14 +import javax.annotation.Resource;
  15 +import java.util.Collection;
  16 +import java.util.List;
  17 +
  18 +import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_NOT_EXISTS;
  19 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  20 +
  21 +/**
  22 + * 用户组 Service 实现类
  23 + *
  24 + * @author 芋道源码
  25 + */
  26 +@Service
  27 +@Validated
  28 +public class BpmUserGroupServiceImpl implements BpmUserGroupService {
  29 +
  30 + @Resource
  31 + private BpmUserGroupMapper userGroupMapper;
  32 +
  33 + @Override
  34 + public Long createUserGroup(BpmUserGroupCreateReqVO createReqVO) {
  35 + // 插入
  36 + BpmUserGroupDO userGroup = BpmUserGroupConvert.INSTANCE.convert(createReqVO);
  37 + userGroupMapper.insert(userGroup);
  38 + // 返回
  39 + return userGroup.getId();
  40 + }
  41 +
  42 + @Override
  43 + public void updateUserGroup(BpmUserGroupUpdateReqVO updateReqVO) {
  44 + // 校验存在
  45 + this.validateUserGroupExists(updateReqVO.getId());
  46 + // 更新
  47 + BpmUserGroupDO updateObj = BpmUserGroupConvert.INSTANCE.convert(updateReqVO);
  48 + userGroupMapper.updateById(updateObj);
  49 + }
  50 +
  51 + @Override
  52 + public void deleteUserGroup(Long id) {
  53 + // 校验存在
  54 + this.validateUserGroupExists(id);
  55 + // 删除
  56 + userGroupMapper.deleteById(id);
  57 + }
  58 +
  59 + private void validateUserGroupExists(Long id) {
  60 + if (userGroupMapper.selectById(id) == null) {
  61 + throw exception(USER_GROUP_NOT_EXISTS);
  62 + }
  63 + }
  64 +
  65 + @Override
  66 + public BpmUserGroupDO getUserGroup(Long id) {
  67 + return userGroupMapper.selectById(id);
  68 + }
  69 +
  70 + @Override
  71 + public List<BpmUserGroupDO> getUserGroupList(Collection<Long> ids) {
  72 + return userGroupMapper.selectBatchIds(ids);
  73 + }
  74 +
  75 + @Override
  76 + public PageResult<BpmUserGroupDO> getUserGroupPage(BpmUserGroupPageReqVO pageReqVO) {
  77 + return userGroupMapper.selectPage(pageReqVO);
  78 + }
  79 +
  80 +}
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/dataobject/dept/SysDeptDO.java
  View file @5efb4c2
... ... @@ -12,6 +12,7 @@ import lombok.EqualsAndHashCode;
12 12 * 部门表
13 13 *
14 14 * @author ruoyi
  15 + * @author 芋道源码
15 16 */
16 17 @TableName("sys_dept")
17 18 @Data
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java
  View file @5efb4c2
... ... @@ -258,6 +258,7 @@ public class ToolCodegenServiceImpl implements ToolCodegenService {
258 258 List<ToolSchemaTableDO> tables = schemaTableMapper.selectList(codegenProperties.getDbSchemas(), tableName, tableComment);
259 259 // TODO 强制移除 Quartz 的表，未来做成可配置
260 260 tables.removeIf(table -> table.getTableName().startsWith("QRTZ_"));
  261 + tables.removeIf(table -> table.getTableName().startsWith("ACT_"));
261 262 return tables;
262 263 }
263 264  
... ...
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmUserGroupServiceTest.java 0 → 100644
  View file @5efb4c2
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
  2 +
  3 +import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;
  8 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmUserGroupMapper;
  9 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl.BpmUserGroupServiceImpl;
  10 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  11 +import org.junit.jupiter.api.Test;
  12 +import org.springframework.context.annotation.Import;
  13 +
  14 +import javax.annotation.Resource;
  15 +
  16 +import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_NOT_EXISTS;
  17 +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
  18 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  19 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  20 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
  21 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
  22 +import static org.junit.jupiter.api.Assertions.*;
  23 +
  24 +/**
  25 +* {@link BpmUserGroupServiceImpl} 的单元测试类
  26 +*
  27 +* @author 芋道源码
  28 +*/
  29 +@Import(BpmUserGroupServiceImpl.class)
  30 +public class BpmUserGroupServiceTest extends BaseDbUnitTest {
  31 +
  32 + @Resource
  33 + private BpmUserGroupServiceImpl userGroupService;
  34 +
  35 + @Resource
  36 + private BpmUserGroupMapper userGroupMapper;
  37 +
  38 + @Test
  39 + public void testCreateUserGroup_success() {
  40 + // 准备参数
  41 + BpmUserGroupCreateReqVO reqVO = randomPojo(BpmUserGroupCreateReqVO.class);
  42 +
  43 + // 调用
  44 + Long userGroupId = userGroupService.createUserGroup(reqVO);
  45 + // 断言
  46 + assertNotNull(userGroupId);
  47 + // 校验记录的属性是否正确
  48 + BpmUserGroupDO userGroup = userGroupMapper.selectById(userGroupId);
  49 + assertPojoEquals(reqVO, userGroup);
  50 + }
  51 +
  52 + @Test
  53 + public void testUpdateUserGroup_success() {
  54 + // mock 数据
  55 + BpmUserGroupDO dbUserGroup = randomPojo(BpmUserGroupDO.class);
  56 + userGroupMapper.insert(dbUserGroup);// @Sql: 先插入出一条存在的数据
  57 + // 准备参数
  58 + BpmUserGroupUpdateReqVO reqVO = randomPojo(BpmUserGroupUpdateReqVO.class, o -> {
  59 + o.setId(dbUserGroup.getId()); // 设置更新的 ID
  60 + });
  61 +
  62 + // 调用
  63 + userGroupService.updateUserGroup(reqVO);
  64 + // 校验是否更新正确
  65 + BpmUserGroupDO userGroup = userGroupMapper.selectById(reqVO.getId()); // 获取最新的
  66 + assertPojoEquals(reqVO, userGroup);
  67 + }
  68 +
  69 + @Test
  70 + public void testUpdateUserGroup_notExists() {
  71 + // 准备参数
  72 + BpmUserGroupUpdateReqVO reqVO = randomPojo(BpmUserGroupUpdateReqVO.class);
  73 +
  74 + // 调用, 并断言异常
  75 + assertServiceException(() -> userGroupService.updateUserGroup(reqVO), USER_GROUP_NOT_EXISTS);
  76 + }
  77 +
  78 + @Test
  79 + public void testDeleteUserGroup_success() {
  80 + // mock 数据
  81 + BpmUserGroupDO dbUserGroup = randomPojo(BpmUserGroupDO.class);
  82 + userGroupMapper.insert(dbUserGroup);// @Sql: 先插入出一条存在的数据
  83 + // 准备参数
  84 + Long id = dbUserGroup.getId();
  85 +
  86 + // 调用
  87 + userGroupService.deleteUserGroup(id);
  88 + // 校验数据不存在了
  89 + assertNull(userGroupMapper.selectById(id));
  90 + }
  91 +
  92 + @Test
  93 + public void testDeleteUserGroup_notExists() {
  94 + // 准备参数
  95 + Long id = randomLongId();
  96 +
  97 + // 调用, 并断言异常
  98 + assertServiceException(() -> userGroupService.deleteUserGroup(id), USER_GROUP_NOT_EXISTS);
  99 + }
  100 +
  101 + @Test // TODO 请修改 null 为需要的值
  102 + public void testGetUserGroupPage() {
  103 + // mock 数据
  104 + BpmUserGroupDO dbUserGroup = randomPojo(BpmUserGroupDO.class, o -> { // 等会查询到
  105 + o.setName(null);
  106 + o.setStatus(null);
  107 + o.setCreateTime(null);
  108 + });
  109 + userGroupMapper.insert(dbUserGroup);
  110 + // 测试 name 不匹配
  111 + userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setName(null)));
  112 + // 测试 status 不匹配
  113 + userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setStatus(null)));
  114 + // 测试 createTime 不匹配
  115 + userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setCreateTime(null)));
  116 + // 准备参数
  117 + BpmUserGroupPageReqVO reqVO = new BpmUserGroupPageReqVO();
  118 + reqVO.setName(null);
  119 + reqVO.setStatus(null);
  120 + reqVO.setBeginCreateTime(null);
  121 + reqVO.setEndCreateTime(null);
  122 +
  123 + // 调用
  124 + PageResult<BpmUserGroupDO> pageResult = userGroupService.getUserGroupPage(reqVO);
  125 + // 断言
  126 + assertEquals(1, pageResult.getTotal());
  127 + assertEquals(1, pageResult.getList().size());
  128 + assertPojoEquals(dbUserGroup, pageResult.getList().get(0));
  129 + }
  130 +
  131 +}
... ...
yudao-admin-ui/src/api/bpm/userGroup.js 0 → 100644
  View file @5efb4c2
  1 +import request from '@/utils/request'
  2 +
  3 +// 创建用户组
  4 +export function createUserGroup(data) {
  5 + return request({
  6 + url: '/bpm/user-group/create',
  7 + method: 'post',
  8 + data: data
  9 + })
  10 +}
  11 +
  12 +// 更新用户组
  13 +export function updateUserGroup(data) {
  14 + return request({
  15 + url: '/bpm/user-group/update',
  16 + method: 'put',
  17 + data: data
  18 + })
  19 +}
  20 +
  21 +// 删除用户组
  22 +export function deleteUserGroup(id) {
  23 + return request({
  24 + url: '/bpm/user-group/delete?id=' + id,
  25 + method: 'delete'
  26 + })
  27 +}
  28 +
  29 +// 获得用户组
  30 +export function getUserGroup(id) {
  31 + return request({
  32 + url: '/bpm/user-group/get?id=' + id,
  33 + method: 'get'
  34 + })
  35 +}
  36 +
  37 +// 获得用户组分页
  38 +export function getUserGroupPage(query) {
  39 + return request({
  40 + url: '/bpm/user-group/page',
  41 + method: 'get',
  42 + params: query
  43 + })
  44 +}
... ...
yudao-admin-ui/src/views/bpm/group/index.vue 0 → 100644
  View file @5efb4c2
  1 +<template>
  2 + <div class="app-container">
  3 +
  4 + <!-- 搜索工作栏 -->
  5 + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
  6 + <el-form-item label="组名" prop="name">
  7 + <el-input v-model="queryParams.name" placeholder="请输入组名" clearable size="small" @keyup.enter.native="handleQuery"/>
  8 + </el-form-item>
  9 + <el-form-item label="状态" prop="status">
  10 + <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
  11 + <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
  12 + :key="dict.value" :label="dict.label" :value="dict.value"/>
  13 + </el-select>
  14 + </el-form-item>
  15 + <el-form-item label="创建时间">
  16 + <el-date-picker v-model="dateRangeCreateTime" size="small" style="width: 240px" value-format="yyyy-MM-dd"
  17 + type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  18 + </el-form-item>
  19 + <el-form-item>
  20 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  21 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
  22 + </el-form-item>
  23 + </el-form>
  24 +
  25 + <!-- 操作工具栏 -->
  26 + <el-row :gutter="10" class="mb8">
  27 + <el-col :span="1.5">
  28 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
  29 + v-hasPermi="['bpm:user-group:create']">新增</el-button>
  30 + </el-col>
  31 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  32 + </el-row>
  33 +
  34 + <!-- 列表 -->
  35 + <el-table v-loading="loading" :data="list">
  36 + <el-table-column label="编号" align="center" prop="id" />
  37 + <el-table-column label="组名" align="center" prop="name" />
  38 + <el-table-column label="描述" align="center" prop="description" />
  39 + <el-table-column label="成员" align="center">
  40 + <template slot-scope="scope">
  41 + <span v-for="userId in scope.row.memberUserIds">
  42 + {{ getUserNickname(userId) }}
  43 + </span>
  44 + </template>
  45 + </el-table-column>
  46 + <el-table-column label="状态" align="center" prop="status">
  47 + <template slot-scope="scope">
  48 + <span>{{ getDictDataLabel(DICT_TYPE.SYS_COMMON_STATUS, scope.row.status) }}</span>
  49 + </template>
  50 + </el-table-column>
  51 + <el-table-column label="创建时间" align="center" prop="createTime" width="180">
  52 + <template slot-scope="scope">
  53 + <span>{{ parseTime(scope.row.createTime) }}</span>
  54 + </template>
  55 + </el-table-column>
  56 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  57 + <template slot-scope="scope">
  58 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
  59 + v-hasPermi="['bpm:user-group:update']">修改</el-button>
  60 + <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
  61 + v-hasPermi="['bpm:user-group:delete']">删除</el-button>
  62 + </template>
  63 + </el-table-column>
  64 + </el-table>
  65 + <!-- 分页组件 -->
  66 + <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
  67 + @pagination="getList"/>
  68 +
  69 + <!-- 对话框(添加 / 修改) -->
  70 + <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
  71 + <el-form ref="form" :model="form" :rules="rules" label-width="80px">
  72 + <el-form-item label="组名" prop="name">
  73 + <el-input v-model="form.name" placeholder="请输入组名" />
  74 + </el-form-item>
  75 + <el-form-item label="描述" prop="description">
  76 + <el-input v-model="form.description" placeholder="请输入描述" />
  77 + </el-form-item>
  78 + <el-form-item label="成员" prop="memberUserIds">
  79 + <el-select v-model="form.memberUserIds" multiple placeholder="请选择成员">
  80 + <el-option v-for="user in users" :key="parseInt(user.id)" :label="user.nickname" :value="parseInt(user.id)"/>
  81 + </el-select>
  82 + </el-form-item>
  83 + <el-form-item label="状态" prop="status">
  84 + <el-radio-group v-model="form.status">
  85 + <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
  86 + :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
  87 + </el-radio-group>
  88 + </el-form-item>
  89 + </el-form>
  90 + <div slot="footer" class="dialog-footer">
  91 + <el-button type="primary" @click="submitForm">确 定</el-button>
  92 + <el-button @click="cancel">取 消</el-button>
  93 + </div>
  94 + </el-dialog>
  95 + </div>
  96 +</template>
  97 +
  98 +<script>
  99 +import { createUserGroup, updateUserGroup, deleteUserGroup, getUserGroup, getUserGroupPage } from "@/api/bpm/userGroup";
  100 +import {SysCommonStatusEnum} from "@/utils/constants";
  101 +import {listSimpleUsers} from "@/api/system/user";
  102 +
  103 +export default {
  104 + name: "UserGroup",
  105 + components: {
  106 + },
  107 + data() {
  108 + return {
  109 + // 遮罩层
  110 + loading: true,
  111 + // 显示搜索条件
  112 + showSearch: true,
  113 + // 总条数
  114 + total: 0,
  115 + // 用户组列表
  116 + list: [],
  117 + // 用户列表
  118 + users: [],
  119 + // 弹出层标题
  120 + title: "",
  121 + // 是否显示弹出层
  122 + open: false,
  123 + dateRangeCreateTime: [],
  124 + // 查询参数
  125 + queryParams: {
  126 + pageNo: 1,
  127 + pageSize: 10,
  128 + name: null,
  129 + status: null,
  130 + tenantId: null,
  131 + },
  132 + // 表单参数
  133 + form: {},
  134 + // 表单校验
  135 + rules: {
  136 + name: [{ required: true, message: "组名不能为空", trigger: "blur" }],
  137 + description: [{ required: true, message: "描述不能为空", trigger: "blur" }],
  138 + memberUserIds: [{ required: true, message: "成员不能为空", trigger: "change" }],
  139 + status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
  140 + }
  141 + };
  142 + },
  143 + created() {
  144 + this.getList();
  145 + // 获得用户列表
  146 + listSimpleUsers().then(response => {
  147 + this.users = response.data;
  148 + })
  149 + },
  150 + methods: {
  151 + /** 查询列表 */
  152 + getList() {
  153 + this.loading = true;
  154 + // 处理查询参数
  155 + let params = {...this.queryParams};
  156 + this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
  157 + // 执行查询
  158 + getUserGroupPage(params).then(response => {
  159 + this.list = response.data.list;
  160 + this.total = response.data.total;
  161 + this.loading = false;
  162 + });
  163 + },
  164 + /** 取消按钮 */
  165 + cancel() {
  166 + this.open = false;
  167 + this.reset();
  168 + },
  169 + /** 表单重置 */
  170 + reset() {
  171 + this.form = {
  172 + id: undefined,
  173 + name: undefined,
  174 + description: undefined,
  175 + memberUserIds: [],
  176 + status: SysCommonStatusEnum.ENABLE,
  177 + };
  178 + this.resetForm("form");
  179 + },
  180 + /** 搜索按钮操作 */
  181 + handleQuery() {
  182 + this.queryParams.pageNo = 1;
  183 + this.getList();
  184 + },
  185 + /** 重置按钮操作 */
  186 + resetQuery() {
  187 + this.dateRangeCreateTime = [];
  188 + this.resetForm("queryForm");
  189 + this.handleQuery();
  190 + },
  191 + /** 新增按钮操作 */
  192 + handleAdd() {
  193 + this.reset();
  194 + this.open = true;
  195 + this.title = "添加用户组";
  196 + },
  197 + /** 修改按钮操作 */
  198 + handleUpdate(row) {
  199 + this.reset();
  200 + const id = row.id;
  201 + getUserGroup(id).then(response => {
  202 + this.form = response.data;
  203 + this.open = true;
  204 + this.title = "修改用户组";
  205 + });
  206 + },
  207 + /** 提交按钮 */
  208 + submitForm() {
  209 + this.$refs["form"].validate(valid => {
  210 + if (!valid) {
  211 + return;
  212 + }
  213 + // 修改的提交
  214 + if (this.form.id != null) {
  215 + updateUserGroup(this.form).then(response => {
  216 + this.msgSuccess("修改成功");
  217 + this.open = false;
  218 + this.getList();
  219 + });
  220 + return;
  221 + }
  222 + // 添加的提交
  223 + createUserGroup(this.form).then(response => {
  224 + this.msgSuccess("新增成功");
  225 + this.open = false;
  226 + this.getList();
  227 + });
  228 + });
  229 + },
  230 + /** 删除按钮操作 */
  231 + handleDelete(row) {
  232 + const id = row.id;
  233 + this.$confirm('是否确认删除用户组编号为"' + id + '"的数据项?', "警告", {
  234 + confirmButtonText: "确定",
  235 + cancelButtonText: "取消",
  236 + type: "warning"
  237 + }).then(function() {
  238 + return deleteUserGroup(id);
  239 + }).then(() => {
  240 + this.getList();
  241 + this.msgSuccess("删除成功");
  242 + })
  243 + },
  244 + getUserNickname(userId) {
  245 + for (const user of this.users) {
  246 + if (user.id === userId) {
  247 + return user.nickname;
  248 + }
  249 + }
  250 + return '未知(' + userId + ')';
  251 + },
  252 + }
  253 +};
  254 +</script>
... ...
更新日志.md
  View file @5efb4c2
... ... @@ -33,13 +33,15 @@
33 33 ### ⭐ New Features
34 34  
35 35 * 【优化】引入 form generator 0.2.0 版本，并重构相关代码
  36 +* 【修改】修改部门负责人，从 String 字符串，调整成和后台用户的用户编号绑定
36 37 * 【新增】流程表单，支持动态进行表单的配置
  38 +* 【新增】工作组，用于支持指定工作组进行任务的审批
37 39 * 【新增】流程模型的管理，支持新增、导入、编辑、删除、发布流程模型
38 40 * 【新增】我的流程的管理，支持发起流程
39 41 * 【新增】待办任务的管理，支持任务的审批通过与不通过
40 42 * 【新增】已办任务的管理，支持详情的查看
  43 +* 【新增】任务分配规则，可指定角色、部门成员、部门负责人、用户、用户组、自定义脚本等维度，进行任务的审批
41 44 * 【新增】引入 bpmn-process-designer 0.0.1 版本，提供流程设计器的能力
42   -* 【修改】修改部门负责人，从 String 字符串，调整成和后台用户的用户编号绑定
43 45  
44 46 ### 🐞 Bug Fixes
45 47  
... ...