bug

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

@@ -70,7 +70,8 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
         if (Objects.isNull(gradeBatch)) {
             throw ExceptionResultEnum.ERROR.exception("教研分析批次不存在");
         }
-        List<GradeBatchPaperResult> datasource = this.baseMapper.findAbleAnalyzePaper(gradeBatch.getSemesterId(), examId, collegeId, courseCode, teacherName, orgIds, schoolId);
+
+        List<GradeBatchPaperResult> datasource = this.baseMapper.findAbleAnalyzePaper(gradeBatch.getSemesterId(), examId, collegeId, courseCode, SystemConstant.translateSpecificSign(teacherName), orgIds, schoolId);
         List<GradeBatchPaperResult> needAddList = new ArrayList<>();
         for (GradeBatchPaperResult gradeBatchPaperResult : datasource) {
             // 额外处理开课学院

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

@@ -101,6 +101,9 @@
             <if test="courseCode != null and courseCode != ''">
                 AND et.course_code = #{courseCode}
             </if>
+            <if test="teacherName != null and teacherName != ''">
+                AND et.teacher_name LIKE CONCAT('%',#{teacherName} ,'%')
+            </if>
             <if test="orgIds != null and orgIds != '' and orgIds.size > 0">
                 AND et.org_id IN
                 <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">

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

@@ -212,6 +212,19 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             } else if (Objects.nonNull(schoolId)) {
                 role.setSchoolId(schoolId);
             }
+            // 系统默认内置角色（不允许和系统默认角色重名）
+            List<String> defaultRoleNames = this.list(new QueryWrapper<SysRole>().lambda()
+                    .eq(SysRole::getDefaultRole,true)
+                    .eq(SysRole::getEnable,true))
+                    .stream()
+                    .map(SysRole::getName)
+                    .distinct()
+                    .collect(Collectors.toList());
+            String roleName = role.getName();
+            if (defaultRoleNames.contains(roleName)){
+                throw ExceptionResultEnum.ERROR.exception("自定义角色名称不能和系统默认角色【" + roleName + "】同名");
+            }
+
             if (Objects.nonNull(role.getId())) {//编辑
                 List<SysRolePrivilege> sysRolePrivilegeList = commonCacheService.rolePrivilegeCache(role.getId());
                 QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();