3.3.0 fix

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/UserExportDto.java

@@ -23,6 +23,7 @@ public class UserExportDto {
     @ExcelProperty(name = "手机号", width = 15, index = 4)
     private String mobileNumber;
     private Boolean enable;
+    private Long orgId;
     @ExcelProperty(name = "所在机构", width = 20, index = 5)
     private String orgName;
     private List<SysRole> roles;
@@ -79,6 +80,14 @@ public class UserExportDto {
         this.enable = enable;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getOrgName() {
         return orgName;
     }

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

@@ -1092,12 +1092,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public void exportData(HttpServletResponse response, String userInfo, Long orgId, String roleId, Boolean enable) throws Exception {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        sysOrgService.list();
 
         List<UserExportDto> userExportDtos = this.baseMapper.listExportData(schoolId, SystemConstant.translateSpecificSign(userInfo), orgId, roleId, enable);
         if (userExportDtos.isEmpty()) {
             throw ExceptionResultEnum.ERROR.exception("没有可导出数据");
         }
         userExportDtos.forEach(m -> {
+            List<SysOrg> byConnectByParentIdList = sysOrgService.findByConnectByParentId(m.getOrgId(), true, false);
+            if(CollectionUtils.isNotEmpty(byConnectByParentIdList)){
+                m.setOrgName(byConnectByParentIdList.stream().map(SysOrg::getName).collect(Collectors.joining("/")));
+            }
             //角色
             List<SysRole> roles = sysRoleService.listRolesByUserId(Long.valueOf(m.getId()));
             if (roles.isEmpty()) {

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

@@ -6,7 +6,7 @@
         SELECT su.* FROM (SELECT @a AS _id, (SELECT @a := so.parent_id FROM sys_org so WHERE so.id = _id) AS parent_id FROM (SELECT @a := #{orgId}) vars, sys_org h) temp JOIN sys_org su ON temp._id = su.id
         <where>
             <if test="school != null and school != '' and school == 1">
-                and su.type <![CDATA[ <> ]]> 'SCHOOL'
+                and su.type is null
             </if>
             <!--<if test="college != null and college != '' and college == 1">
                 and su.type = 'COLLEGE'

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.QuestionType;
@@ -74,6 +75,7 @@ public class MarkQuestionServiceImpl extends ServiceImpl<MarkQuestionMapper, Mar
     public void saveQuestions(MarkQuestionParams markQuestionParams) {
         Long examId = markQuestionParams.getExamId();
         String paperNumber = markQuestionParams.getPaperNumber();
+        MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumber(examId, paperNumber);
 
         List<MarkQuestion> questions = markQuestionParams.getQuestions();
         if (CollectionUtils.isEmpty(questions)) {
@@ -105,6 +107,10 @@ public class MarkQuestionServiceImpl extends ServiceImpl<MarkQuestionMapper, Mar
             List<MarkQuestion> saveOrUpdateList = new ArrayList<>();
             for (MarkQuestion question : questions) {
                 if (Objects.isNull(question.getId())) {
+                    question.setId(SystemConstant.getDbUuid());
+                    question.setExamId(examId);
+                    question.setPaperNumber(paperNumber);
+                    question.setPaperType(markPaper.getPaperType());
                     saveOrUpdateList.add(question);
                 } else {
                     Optional<MarkQuestion> questionOptional = markQuestionList.stream().filter(m -> m.getId().equals(question.getId())).findFirst();
@@ -124,7 +130,12 @@ public class MarkQuestionServiceImpl extends ServiceImpl<MarkQuestionMapper, Mar
                         saveOrUpdateList.add(markQuestion);
                         markQuestionList.remove(markQuestion);
                     } else {
-                        throw ExceptionResultEnum.ERROR.exception("数据异常，请刷新页面后重新操作");
+                        question.setId(SystemConstant.getDbUuid());
+                        question.setExamId(examId);
+                        question.setPaperNumber(paperNumber);
+                        question.setPaperType(markPaper.getPaperType());
+                        saveOrUpdateList.add(question);
+//                        throw ExceptionResultEnum.ERROR.exception("数据异常，请刷新页面后重新操作");
                     }
                 }
             }