3.4.4 update-20250319，bug修改

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

@@ -1046,6 +1046,12 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                 if (basicTemplate.getConvertA3()) {
                     pdfFileTemp = PDFConverter.pdfA4ToA3(pdfFileTemp, pdfFileTempA3);
                 }
+                // 校验签到表是否自动分页。2页及以上的pdf，每页后面都需要补一个空白页
+                // 补空白页
+                if (basicTemplate.getAddBlankPage()) {
+                    // 补空白页
+                    PdfUtil.addPdfEmptyPage(pdfFileTemp);
+                }
             }
             //pdf生成和上传
             String pdfFileMd5 = DigestUtils.md5Hex(new FileInputStream(pdfFileTemp));

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

@@ -23,7 +23,7 @@ import java.util.Set;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    IPage<UserDto> listForPrintSystem(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("userInfo") String userInfo, @Param("orgId") Long orgId, @Param("roleId") String roleId, @Param("enable") Boolean enable, @Param("dpr") DataPermissionRule dpr);
+    IPage<UserDto> listForPrintSystem(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("userInfo") String userInfo, @Param("orgIds") Set<Long> orgIds, @Param("roleId") String roleId, @Param("enable") Boolean enable, @Param("dpr") DataPermissionRule dpr);
 
     IPage<UserDto> listForReportSystem(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("roleId") String roleId, @Param("enable") Boolean enable, @Param("loginName") String loginName, @Param("realName") String realName);
 

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

@@ -101,7 +101,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
         Page<UserDto> page = new Page<>(pageNumber, pageSize);
-        IPage<UserDto> userDtoIPage = this.baseMapper.listForPrintSystem(page, schoolId, SystemConstant.translateSpecificSign(userInfo), orgId, roleId, enable, dpr);
+        Set<Long> orgIds = null;
+        if (orgId != null) {
+            orgIds = teachcloudCommonService.listSubOrgIds(orgId);
+        }
+        IPage<UserDto> userDtoIPage = this.baseMapper.listForPrintSystem(page, schoolId, SystemConstant.translateSpecificSign(userInfo), orgIds, roleId, enable, dpr);
         if (userDtoIPage.getRecords().size() > 0) {
             userDtoIPage.getRecords().forEach(m -> {
                 //角色

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

@@ -60,8 +60,11 @@
             <if test="userInfo != null and userInfo != ''">
                 and (a.login_name like concat('%', #{userInfo} , '%') or a.real_name like concat('%', #{userInfo} , '%') or a.mobile_number like concat('%', #{userInfo} , '%'))
             </if>
-            <if test="orgId != null and orgId != ''">
-                and a.org_id = #{orgId}
+            <if test="orgIds != null and orgIds.size()>0">
+                and a.org_id in
+                <foreach collection="orgIds" item="id" separator="," open="(" close=")">
+                    #{id}
+                </foreach>
             </if>
             <if test="roleId != null and roleId != ''">
                 and a.id in (select user_id from sys_user_role b where b.role_id = #{roleId})

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/BasicMessageDto.java

@@ -112,9 +112,7 @@ public class BasicMessageDto extends BaseEntity implements Serializable {
 
     public BasicMessageDto(Long schoolId, Long userId, String userName, String mobileNumber, String paperNumber,
                            String courseCode, String variableParams, MessageEnum messageType, Long createId,
-                           String remark, String templateCode, String sendStatus, String message) {
-        this.setSendStatus(sendStatus);
-        this.setSendResult(message);
+                           String remark, String templateCode) {
         this.setId(SystemConstant.getDbUuid());
         this.setSchoolId(schoolId);
         this.setUserId(userId);

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserQuestionServiceImpl.java

@@ -495,19 +495,21 @@ public class MarkUserQuestionServiceImpl extends ServiceImpl<MarkUserQuestionMap
                 throw ExceptionResultEnum.ERROR.exception("短信内容参数值必填");
             }
 
+            basicMessageDto = new BasicMessageDto(schoolId, userId, userName, mobileNumber, paperNumber,
+                    courseCode, variableParams, messageType, createId,
+                    remark, templateCode);
             // 调用阿里云短信平台发送短信
             Map<String, Object> templateParam = JSON.parseObject(variableParams, Map.class);
             SmsResponseResult smsResponseResult = smsSendUtil.sendSms(mobileNumber, templateCode, templateParam);
             if (!SmsSendUtil.OK.equals(smsResponseResult.getCode())) {
                 throw ExceptionResultEnum.ERROR.exception("阿里云短信发送接口调用失败");
             }
-            basicMessageDto = new BasicMessageDto(schoolId, userId, userName, mobileNumber, paperNumber,
-                    courseCode, variableParams, messageType, createId,
-                    remark, templateCode, smsResponseResult.getCode(), smsResponseResult.getMessage());
+            basicMessageDto.setSendStatus(smsResponseResult.getCode());
+            basicMessageDto.setSendResult(smsResponseResult.getMessage());
+
         } catch (Exception e) {
             basicMessageDto.setErrorInfo(e.getMessage());
         } finally {
-            basicMessageDto.setId(SystemConstant.getDbUuid());
             this.baseMapper.insertSms(basicMessageDto);
         }
     }