BUG修复

distributed-print/src/main/java/com/qmth/distributed/print/api/SysRoleGroupMemberController.java

@@ -3,9 +3,9 @@ package com.qmth.distributed.print.api;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
 import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberMatchParams;
 import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberParams;
+import com.qmth.teachcloud.common.bean.result.SysRoleGroupMemberMatchResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysRoleGroupMember;
 import com.qmth.teachcloud.common.service.SysRoleGroupMemberService;
@@ -50,7 +50,7 @@ public class SysRoleGroupMemberController {
         return ResultUtil.ok(sysRoleGroupMemberService.saveOrUpdate(roleGroupMemberParams));
     }
 
-    @ApiOperation(value = "查询")
+    @ApiOperation(value = "成员管理查询")
     @ApiResponses({@ApiResponse(code = 200, message = "角色组成员信息", response = SysRoleGroupMember.class)})
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@RequestParam(value = "roleId") String roleId) {
@@ -58,7 +58,7 @@ public class SysRoleGroupMemberController {
     }
 
     @ApiOperation(value = "匹配查询")
-    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = ApproveUserResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = SysRoleGroupMemberMatchResult.class)})
     @RequestMapping(value = "/match/list", method = RequestMethod.POST)
     public Result matchList(@Valid @RequestBody SysRoleGroupMemberMatchParams roleGroupMemberMatchParams, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/SysRoleGroupMemberMatch.java

@@ -0,0 +1,46 @@
+package com.qmth.teachcloud.common.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 角色组成员match
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2022/3/9
+ */
+public class SysRoleGroupMemberMatch implements Serializable {
+
+    @ApiModelProperty(value = "角色id组")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotEmpty(message = "角色id组不能为空")
+    private List<Long> roleIdList;
+
+    @ApiModelProperty(value = "用户id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
+    public List<Long> getRoleIdList() {
+        return roleIdList;
+    }
+
+    public void setRoleIdList(List<Long> roleIdList) {
+        this.roleIdList = roleIdList;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/SysRoleGroupMemberMatchParams.java

@@ -1,13 +1,9 @@
 package com.qmth.teachcloud.common.bean.params;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,33 +26,4 @@ public class SysRoleGroupMemberMatchParams implements Serializable {
     public void setFlowRoleGroupMemberMatchMap(Map<String, SysRoleGroupMemberMatch> flowRoleGroupMemberMatchMap) {
         this.flowRoleGroupMemberMatchMap = flowRoleGroupMemberMatchMap;
     }
-
-    public class SysRoleGroupMemberMatch implements Serializable {
-
-        @ApiModelProperty(value = "角色id组")
-        @JsonSerialize(using = ToStringSerializer.class)
-        @NotEmpty(message = "角色id组不能为空")
-        private List<Long> roleIdList;
-
-        @ApiModelProperty(value = "用户id")
-        @JsonSerialize(using = ToStringSerializer.class)
-        @NotNull(message = "用户id不能为空")
-        private Long userId;
-
-        public List<Long> getRoleIdList() {
-            return roleIdList;
-        }
-
-        public void setRoleIdList(List<Long> roleIdList) {
-            this.roleIdList = roleIdList;
-        }
-
-        public Long getUserId() {
-            return userId;
-        }
-
-        public void setUserId(Long userId) {
-            this.userId = userId;
-        }
-    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/SysRoleGroupMemberParams.java

@@ -23,10 +23,15 @@ public class SysRoleGroupMemberParams implements Serializable {
     @NotNull(message = "角色id不能为空")
     private Long roleId;
 
-    @ApiModelProperty(value = "用户id组")
+    @ApiModelProperty(value = "用户id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotEmpty(message = "用户id组不能为空")
-    private List<Long> userIdList;
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
+    @ApiModelProperty(value = "成员id组")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotEmpty(message = "成员id组不能为空")
+    private List<Long> memberIdList;
 
     public Long getRoleId() {
         return roleId;
@@ -36,11 +41,19 @@ public class SysRoleGroupMemberParams implements Serializable {
         this.roleId = roleId;
     }
 
-    public List<Long> getUserIdList() {
-        return userIdList;
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public List<Long> getMemberIdList() {
+        return memberIdList;
     }
 
-    public void setUserIdList(List<Long> userIdList) {
-        this.userIdList = userIdList;
+    public void setMemberIdList(List<Long> memberIdList) {
+        this.memberIdList = memberIdList;
     }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/SysRoleGroupMemberMatchResult.java

@@ -0,0 +1,52 @@
+package com.qmth.teachcloud.common.bean.result;
+
+import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 角色组成员返回
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2022/3/9
+ */
+public class SysRoleGroupMemberMatchResult implements Serializable {
+
+    @ApiModelProperty(value = "是否手动选择，true：是，false：不是")
+    boolean manual = false;
+
+    @ApiModelProperty(value = "人员信息")
+    List<ApproveUserResult> approveUserResultList;
+
+    public SysRoleGroupMemberMatchResult() {
+
+    }
+
+    public SysRoleGroupMemberMatchResult(List<ApproveUserResult> approveUserResultList) {
+        this.approveUserResultList = approveUserResultList;
+    }
+
+    public SysRoleGroupMemberMatchResult(boolean manual, List<ApproveUserResult> approveUserResultList) {
+        this.manual = manual;
+        this.approveUserResultList = approveUserResultList;
+    }
+
+    public boolean isManual() {
+        return manual;
+    }
+
+    public void setManual(boolean manual) {
+        this.manual = manual;
+    }
+
+    public List<ApproveUserResult> getApproveUserResultList() {
+        return approveUserResultList;
+    }
+
+    public void setApproveUserResultList(List<ApproveUserResult> approveUserResultList) {
+        this.approveUserResultList = approveUserResultList;
+    }
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysRoleGroupMember.java

@@ -6,6 +6,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -27,12 +28,17 @@ public class SysRoleGroupMember implements Serializable {
 
     @ApiModelProperty(value = "角色id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "角色id不能为空")
     private Long roleId;
 
     @ApiModelProperty(value = "用户id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
+    @ApiModelProperty(value = "成员id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long memberId;
+
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
 
@@ -40,10 +46,19 @@ public class SysRoleGroupMember implements Serializable {
 
     }
 
-    public SysRoleGroupMember(Long roleId, Long userId) {
+    public SysRoleGroupMember(Long roleId, Long userId, Long memberId) {
         this.id = SystemConstant.getDbUuid();
         this.roleId = roleId;
         this.userId = userId;
+        this.memberId = memberId;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
     }
 
     public Long getId() {
@@ -54,12 +69,12 @@ public class SysRoleGroupMember implements Serializable {
         this.id = id;
     }
 
-    public Long getRoleId() {
-        return roleId;
+    public Long getMemberId() {
+        return memberId;
     }
 
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
     }
 
     public Long getUserId() {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/FieldUniqueEnum.java

@@ -33,7 +33,9 @@ public enum FieldUniqueEnum {
 
     student_schoolId_code_orgId_idx("学生学号"),
 
-    custom_flow_schoolId_type_idx("流程类型");
+    custom_flow_schoolId_type_idx("流程类型"),
+
+    role_group_roleId_memberId_idx("角色成员数据重复");
 
     private String title;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysUserMapper.java

@@ -101,11 +101,25 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
     List<SysUser> findByRoleIds(@Param("roleIds") List<Long> roleIds);
 
+    /**
+     * 根据角色ids查找用户
+     *
+     * @param roleIds
+     * @return
+     */
     List<ApproveUserResult> findByRoleIdsForResult(@Param("roleIds") List<Long> roleIds);
 
+    /**
+     * 根据id集合获取
+     *
+     * @param ids
+     * @return
+     */
+    List<ApproveUserResult> findByIdsForResult(@Param("ids") List<Long> ids);
 
     /**
      * 根据学校id查找用户
+     *
      * @param schoolId 学校id
      * @return 用户集合
      */

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysRoleGroupMemberService.java

@@ -1,9 +1,9 @@
 package com.qmth.teachcloud.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
 import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberMatchParams;
 import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberParams;
+import com.qmth.teachcloud.common.bean.result.SysRoleGroupMemberMatchResult;
 import com.qmth.teachcloud.common.entity.SysRoleGroupMember;
 
 import java.util.List;
@@ -35,11 +35,28 @@ public interface SysRoleGroupMemberService extends IService<SysRoleGroupMember>
      */
     public List<SysRoleGroupMember> findByRoleId(Long roleId);
 
+    /**
+     * 根据roleId和userId查找数据
+     *
+     * @param roleId
+     * @param userId
+     * @return
+     */
+    public List<SysRoleGroupMember> findByRoleIdAndUserId(Long roleId, Long userId);
+
+    /**
+     * 根据memberId查找数据
+     *
+     * @param memberId
+     * @return
+     */
+    public List<SysRoleGroupMember> findByMemberId(Long memberId);
+
     /**
      * 流程数据组匹配查询
      *
      * @param roleGroupMemberMatchParams
      * @return
      */
-    public Map<String, List<ApproveUserResult>> matchList(SysRoleGroupMemberMatchParams roleGroupMemberMatchParams);
+    public Map<String, SysRoleGroupMemberMatchResult> matchList(SysRoleGroupMemberMatchParams roleGroupMemberMatchParams);
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysUserService.java

@@ -224,6 +224,14 @@ public interface SysUserService extends IService<SysUser> {
      */
     List<ApproveUserResult> findByRoleIdsForResult(List<Long> roleIds);
 
+    /**
+     * 根据id集合获取
+     *
+     * @param ids
+     * @return
+     */
+    public List<ApproveUserResult> findByIdsForResult(List<Long> ids);
+
     /**
      * 根据用户id查找该用户所属的机构集合
      *

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysRoleGroupMemberServiceImpl.java

@@ -2,19 +2,26 @@ package com.qmth.teachcloud.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.api.exception.ApiException;
 import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
+import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberMatch;
 import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberMatchParams;
 import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberParams;
+import com.qmth.teachcloud.common.bean.result.SysRoleGroupMemberMatchResult;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysRoleGroupMember;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.FieldUniqueEnum;
 import com.qmth.teachcloud.common.mapper.SysRoleGroupMemberMapper;
 import com.qmth.teachcloud.common.service.SysRoleGroupMemberService;
 import com.qmth.teachcloud.common.service.SysUserService;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -40,28 +47,41 @@ public class SysRoleGroupMemberServiceImpl extends ServiceImpl<SysRoleGroupMembe
     @Override
     @Transactional
     public boolean saveOrUpdate(SysRoleGroupMemberParams roleGroupMemberParams) {
-        //先查询数据库里的数据
-        List<SysRoleGroupMember> sysRoleGroupMemberDbList = this.findByRoleId(roleGroupMemberParams.getRoleId());
-        List<SysRoleGroupMember> sysRoleGroupMemberList = null;
-        List<Long> userIdList = roleGroupMemberParams.getUserIdList();
-        if (Objects.nonNull(sysRoleGroupMemberDbList) && sysRoleGroupMemberDbList.size() > 0) {//编辑
-            int count = (int) sysRoleGroupMemberDbList.stream().filter(s -> userIdList.contains(s.getUserId())).count();
-            if (count != sysRoleGroupMemberDbList.size() || userIdList.size() != sysRoleGroupMemberDbList.size()) {
-                //全量删除
-                this.removeByIds(sysRoleGroupMemberDbList.stream().map(s -> s.getId()).collect(Collectors.toList()));
+        try {
+            //先查询数据库里的数据
+            List<SysRoleGroupMember> sysRoleGroupMemberDbList = this.findByRoleIdAndUserId(roleGroupMemberParams.getRoleId(), roleGroupMemberParams.getUserId());
+            List<SysRoleGroupMember> sysRoleGroupMemberList = null;
+            List<Long> memberIdList = roleGroupMemberParams.getMemberIdList();
+            if (Objects.nonNull(sysRoleGroupMemberDbList) && sysRoleGroupMemberDbList.size() > 0) {//编辑
+                int count = (int) sysRoleGroupMemberDbList.stream().filter(s -> memberIdList.contains(s.getUserId())).count();
+                if (count != sysRoleGroupMemberDbList.size() || memberIdList.size() != sysRoleGroupMemberDbList.size()) {
+                    //全量删除
+                    this.removeByIds(sysRoleGroupMemberDbList.stream().map(s -> s.getId()).collect(Collectors.toList()));
+                    sysRoleGroupMemberList = new ArrayList<>();
+                    for (Long l : memberIdList) {
+                        sysRoleGroupMemberList.add(new SysRoleGroupMember(roleGroupMemberParams.getRoleId(), roleGroupMemberParams.getUserId(), l));
+                    }
+                }
+            } else {
                 sysRoleGroupMemberList = new ArrayList<>();
-                for (Long l : userIdList) {
-                    sysRoleGroupMemberList.add(new SysRoleGroupMember(roleGroupMemberParams.getRoleId(), l));
+                for (Long l : memberIdList) {
+                    sysRoleGroupMemberList.add(new SysRoleGroupMember(roleGroupMemberParams.getRoleId(), roleGroupMemberParams.getUserId(), l));
                 }
             }
-        } else {
-            sysRoleGroupMemberList = new ArrayList<>();
-            for (Long l : userIdList) {
-                sysRoleGroupMemberList.add(new SysRoleGroupMember(roleGroupMemberParams.getRoleId(), l));
+            if (Objects.nonNull(sysRoleGroupMemberList)) {
+                this.saveBatch(sysRoleGroupMemberList);
+            }
+        } catch (Exception e) {
+            log.error(SystemConstant.LOG_ERROR, e);
+            if (e instanceof DuplicateKeyException) {
+                String errorColumn = e.getCause().toString();
+                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
+                throw ExceptionResultEnum.SQL_ERROR.exception("[" + FieldUniqueEnum.convertToTitle(columnStr) + "]数据不允许重复插入");
+            } else if (e instanceof ApiException) {
+                ResultUtil.error((ApiException) e, e.getMessage());
+            } else {
+                ResultUtil.error(e.getMessage());
             }
-        }
-        if (Objects.nonNull(sysRoleGroupMemberList)) {
-            this.saveBatch(sysRoleGroupMemberList);
         }
         return true;
     }
@@ -74,8 +94,31 @@ public class SysRoleGroupMemberServiceImpl extends ServiceImpl<SysRoleGroupMembe
      */
     @Override
     public List<SysRoleGroupMember> findByRoleId(Long roleId) {
+        return this.list(new QueryWrapper<SysRoleGroupMember>().lambda().eq(SysRoleGroupMember::getRoleId, roleId));
+    }
+
+    /**
+     * 根据roleId和userId查找数据
+     *
+     * @param roleId
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<SysRoleGroupMember> findByRoleIdAndUserId(Long roleId, Long userId) {
+        return this.list(new QueryWrapper<SysRoleGroupMember>().lambda().eq(SysRoleGroupMember::getRoleId, roleId).eq(SysRoleGroupMember::getUserId, userId));
+    }
+
+    /**
+     * 根据memberId查找数据
+     *
+     * @param memberId
+     * @return
+     */
+    @Override
+    public List<SysRoleGroupMember> findByMemberId(Long memberId) {
         QueryWrapper<SysRoleGroupMember> sysRoleGroupMemberQueryWrapper = new QueryWrapper<>();
-        sysRoleGroupMemberQueryWrapper.lambda().eq(SysRoleGroupMember::getRoleId, roleId);
+        sysRoleGroupMemberQueryWrapper.lambda().eq(SysRoleGroupMember::getMemberId, memberId);
         return this.list(sysRoleGroupMemberQueryWrapper);
     }
 
@@ -86,22 +129,25 @@ public class SysRoleGroupMemberServiceImpl extends ServiceImpl<SysRoleGroupMembe
      * @return
      */
     @Override
-    public Map<String, List<ApproveUserResult>> matchList(SysRoleGroupMemberMatchParams roleGroupMemberMatchParams) {
-        Map<String, SysRoleGroupMemberMatchParams.SysRoleGroupMemberMatch> map = roleGroupMemberMatchParams.getFlowRoleGroupMemberMatchMap();
-        map.forEach((k, v) -> {
-            List<Long> roleIdList = v.getRoleIdList();
-            Map<Long, Long> roleIdMap = roleIdList.stream().collect(
-                    Collectors.toMap(s -> s, Function.identity(), (dto1, dto2) -> dto1));
-
-            //查询该角色下的用户
-            List<ApproveUserResult> approveUserResultList = sysUserService.findByRoleIdsForResult(roleIdList);
-            Long userId = v.getUserId();
-            Map<Long, ApproveUserResult> approveUserResultMap = new HashMap<>();
-            for (ApproveUserResult a : approveUserResultList) {
-                if (a.getId().longValue() == userId.longValue()) {
-                }
+    public Map<String, SysRoleGroupMemberMatchResult> matchList(SysRoleGroupMemberMatchParams roleGroupMemberMatchParams) {
+        Map<String, SysRoleGroupMemberMatchResult> approveUserResultMap = null;
+        Map<String, SysRoleGroupMemberMatch> map = roleGroupMemberMatchParams.getFlowRoleGroupMemberMatchMap();
+        for (Map.Entry<String, SysRoleGroupMemberMatch> entry : map.entrySet()) {
+            List<SysRoleGroupMember> sysRoleGroupMemberList = this.findByMemberId(entry.getValue().getUserId());
+//            List<SysRoleGroupMember> sysRoleGroupMemberFilter = sysRoleGroupMemberList.stream().filter(s -> v.getRoleIdList().contains(s.getRoleId())).collect(Collectors.toList());
+//            boolean manual = false;
+//            if (Objects.nonNull(sysRoleGroupMemberFilter) && sysRoleGroupMemberFilter.size() == 1) {//直接返回
+//                manual = false;
+//            } else if (Objects.nonNull(sysRoleGroupMemberFilter) && sysRoleGroupMemberFilter.size() > 1) {//前端选择
+//                manual = true;
+//            }
+//            List<SysRoleGroupMember> sysRoleGroupMembers = this.findByRoleIds(sysRoleGroupMemberFilter.stream().map(s -> s.getRoleId()).collect(Collectors.toList()), v.getUserId());
+            if (Objects.nonNull(sysRoleGroupMemberList) && sysRoleGroupMemberList.size() > 0) {
+                approveUserResultMap = Objects.isNull(approveUserResultMap) ? new LinkedHashMap<>() : approveUserResultMap;
+                List<ApproveUserResult> approveUserResultList = sysUserService.findByRoleIdsForResult(sysRoleGroupMemberList.stream().map(s -> s.getRoleId()).collect(Collectors.toList()));
+                approveUserResultMap.put(entry.getKey(), new SysRoleGroupMemberMatchResult(approveUserResultList));
             }
-        });
-        return null;
+        }
+        return approveUserResultMap;
     }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -1062,6 +1062,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return sysUserMapper.findByRoleIdsForResult(roleIds);
     }
 
+    /**
+     * 根据id集合获取
+     *
+     * @param ids
+     * @return
+     */
+    @Override
+    public List<ApproveUserResult> findByIdsForResult(List<Long> ids) {
+        return sysUserMapper.findByIdsForResult(ids);
+    }
+
     @Override
     public List<Long> findOrgIdListByUserId(Long userId) {
         List<Long> orgIdList = new ArrayList<>();

teachcloud-common/src/main/resources/mapper/SysUserMapper.xml

@@ -181,6 +181,7 @@
             <if test="id != null and id != ''">
                 and su.id = #{id}
             </if>
+                and su.enable = 1
         </where>
     </select>
 
@@ -199,6 +200,7 @@
                     #{item}
                 </foreach>
             </if>
+                and su.enable = 1
         </where>
     </select>
 
@@ -211,6 +213,7 @@
                     #{item}
                 </foreach>
             </if>
+                and su.enable = 1
         </where>
     </select>
 
@@ -262,6 +265,19 @@
         </where>
     </select>
 
+    <select id="findByIdsForResult" resultType="com.qmth.teachcloud.common.bean.params.ApproveUserResult">
+        <include refid="approveUserResultHeaderCommon" />
+        <where>
+            <if test="ids != null">
+                AND su.id IN
+                <foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            and su.enable = 1
+        </where>
+    </select>
+
     <select id="findVerifyCodeByUser" resultType="com.qmth.teachcloud.common.bean.dto.VerifyCodeCheckDto">
         SELECT
             id,