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

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

@@ -172,7 +172,7 @@ public class CommonServiceImpl implements CommonService {
                     authBean = new AuthBean(sysRoleList, sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
                 } else {
                     BasicSchool tbSchool = cacheService.schoolCache(user.getSchoolId());
-                    SysOrg org = cacheService.orgCache(user.getOrgId());
+                    SysOrg org = Objects.nonNull(user.getOrgId()) ? cacheService.orgCache(user.getOrgId()) : null;
                     sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
                             .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
                     List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
@@ -508,7 +508,7 @@ public class CommonServiceImpl implements CommonService {
         if (examTask != null && examTask.getStatus().name().equals(ExamStatusEnum.FINISH.name())) {
             // 2.校验考务数据是否导入
             List<ExamDetail> examDetails = examDetailService.listByCourseCodeAndPaperNumber(schoolId, courseCode, paperNumber);
-            if (examDetails!= null && examDetails.size() > 0) {
+            if (examDetails != null && examDetails.size() > 0) {
                 // 3.检查examDetailId下有无其它课程
                 for (ExamDetail examDetail : examDetails) {
                     List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listByExamDetailId(examDetail.getId());

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

@@ -196,15 +196,15 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         response.setHeader("Content-Disposition", "inline;filename=" + URLEncoder.encode(fileName, SystemConstant.CHARSET_NAME) + DEFALUT_EXT);
         response.setContentType(DEFALUT_CONTENT_TYPE);
         HSSFSheet sheet = wb.createSheet(cacheService.schoolCache(schoolId).getName() + "考务数据模板");
-        sheet.setDefaultRowHeight((short) (2 * 256));
-//        sheet.setColumnWidth(0, 50 * 160);
 
         HSSFFont font = wb.createFont();
-        font.setFontHeightInPoints((short) 16);
+        font.setFontHeightInPoints((short) 11);
+        font.setFontName("宋体"); //什么字体
 
         HSSFRow row = sheet.createRow(0);
         HSSFCellStyle style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
+        style.setFont(font);
 
         for (int i = 0; i < fieldsNameList.size(); i++) {
             HSSFCell cell = row.createCell(i);

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

@@ -217,12 +217,13 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
      */
     public TBTask saveTaskCommon(BasicAttachment basicAttachment, TaskTypeEnum taskTypeEnum, Map map) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+
         TBTask tbTask = new TBTask(taskTypeEnum,
                 TaskStatusEnum.INIT,
                 Objects.nonNull(basicAttachment) ? basicAttachment.getName() : null,
                 Objects.nonNull(basicAttachment) ? basicAttachment.getPath() : null,
                 requestUser.getId(),
-                requestUser.getSchoolId());
+                Long.parseLong(ServletUtil.getRequestHeaderSchoolId().toString()));
         map.computeIfAbsent(SystemConstant.TASK, v -> tbTask);
         map.computeIfAbsent(SystemConstant.USER, v -> requestUser);
         return tbTask;

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

@@ -40,10 +40,18 @@
             basic_template_org org
                 INNER JOIN
             basic_template tmp ON org.rule_id = tmp.id
-        WHERE (tmp.type = 'VARIABLE' OR tmp.type = 'ORDINARY') AND org.org_id IN
-        <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <where>
+            AND (tmp.type = 'VARIABLE' OR tmp.type = 'ORDINARY')
+        <if test="orgIds.size() == 0">
+            AND org.org_id IN (null)
+        </if>
+            <if test="orgIds.size() > 0">
+                AND org.org_id IN
+                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
     </select>
 
 </mapper>