mirror of
https://gitee.com/hhyykk/ipms-sjy.git
synced 2025-08-01 20:04:06 +08:00
同步最新的表结构
This commit is contained in:
@@ -139,7 +139,7 @@ public class BpmUserTaskActivitiBehavior extends UserTaskActivityBehavior {
|
||||
}
|
||||
|
||||
private Set<Long> calculateTaskCandidateUsersByDeptMember(TaskEntity task, BpmTaskAssignRuleDO rule) {
|
||||
List<SysUserDO> users = userService.getUsersByPostIds(rule.getOptions());
|
||||
List<SysUserDO> users = userService.getUsersByDeptIds(rule.getOptions());
|
||||
return convertSet(users, SysUserDO::getId);
|
||||
}
|
||||
|
||||
|
@@ -158,7 +158,7 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
|
||||
private void validTaskAssignRuleOptions(Integer type, Set<Long> options) {
|
||||
if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.ROLE.getType())) {
|
||||
roleService.validRoles(options);
|
||||
} else if (ObjectUtils.equalsAny(BpmTaskAssignRuleTypeEnum.DEPT_MEMBER.getType(),
|
||||
} else if (ObjectUtils.equalsAny(type, BpmTaskAssignRuleTypeEnum.DEPT_MEMBER.getType(),
|
||||
BpmTaskAssignRuleTypeEnum.DEPT_LEADER.getType())) {
|
||||
deptService.validDepts(options);
|
||||
} else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.POST.getType())) {
|
||||
|
@@ -68,7 +68,7 @@ public interface SysUserMapper extends BaseMapperX<SysUserDO> {
|
||||
return selectList("status", status);
|
||||
}
|
||||
|
||||
default List<SysUserDO> selectListByDeptIds(Collection<Integer> deptIds) {
|
||||
default List<SysUserDO> selectListByDeptIds(Collection<Long> deptIds) {
|
||||
return selectList("dept_id", deptIds);
|
||||
}
|
||||
|
||||
|
@@ -188,7 +188,7 @@ public interface SysUserService {
|
||||
* @param deptIds 部门数组
|
||||
* @return 用户数组
|
||||
*/
|
||||
List<SysUserDO> getUsersByDeptIds(Collection<Integer> deptIds);
|
||||
List<SysUserDO> getUsersByDeptIds(Collection<Long> deptIds);
|
||||
|
||||
/**
|
||||
* 校验用户们是否有效。如下情况,视为无效:
|
||||
|
@@ -402,7 +402,7 @@ public class SysUserServiceImpl implements SysUserService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysUserDO> getUsersByDeptIds(Collection<Integer> deptIds) {
|
||||
public List<SysUserDO> getUsersByDeptIds(Collection<Long> deptIds) {
|
||||
if (CollUtil.isEmpty(deptIds)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
Reference in New Issue
Block a user