Merge branch 'dev_v3.0.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v3.0.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -1866,6 +1866,9 @@ public class ActivitiServiceImpl implements ActivitiService {
                             case ROLE://角色
                                 if (Objects.nonNull(customFlowPropertyDto.getApproveRoles()) && customFlowPropertyDto.getApproveRoles().size() > 0) {
                                     List<SysUser> sysUserList = sysUserService.findByRoleIds(customFlowPropertyDto.getApproveRoles().stream().map(x -> x.getId()).collect(Collectors.toList()));
+                                    if (Objects.isNull(sysUserList) || sysUserList.size() == 0) {
+                                        throw ExceptionResultEnum.ERROR.exception(customFlowPropertyDto.getApproveRoles().stream().map(x -> x.getName()).collect(Collectors.toList()) + "角色下未找到用户");
+                                    }
                                     approveUserIds.addAll(sysUserList.stream().map(x -> String.valueOf(x.getId())).collect(Collectors.toList()));
                                 }
                                 break;

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -428,7 +428,7 @@
             join ACT_HI_TASKINST t on
                 t.ID_ = temp.TASK_ID_
             join t_f_flow_join tffj on
-                tffj.flow_id = t.PROC_INST_ID_
+                tffj.flow_id = t.PROC_INST_ID_) temp where temp.PROC_INST_ID_ = tffj.flow_id)
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>

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

@@ -185,7 +185,7 @@
     </select>
 
     <select id="findByIds" resultType="com.qmth.teachcloud.common.bean.params.ApproveUserResult">
-        select group_concat(su.real_name,'(',so.name,')') as pendApproveUsers from sys_user su left join sys_org so on so.id = su.org_id
+        select group_concat(su.real_name,'(',so.name,')' order by field(su.id,#{ids})) as pendApproveUsers from sys_user su left join sys_org so on so.id = su.org_id
         <where>
             <if test="ids != null">
                 AND su.id IN