1.0.4 优化联调bug

paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/DocManageDetailResult.java

@@ -15,6 +15,7 @@ public class DocManageDetailResult {
     private String courseName;
     private String teacher;
     private String teachClass;
+    private String examRoom;
     private String collegeName;
     private String majorName;
     private String className;
@@ -86,6 +87,14 @@ public class DocManageDetailResult {
         this.teachClass = teachClass;
     }
 
+    public String getExamRoom() {
+        return examRoom;
+    }
+
+    public void setExamRoom(String examRoom) {
+        this.examRoom = examRoom;
+    }
+
     public String getCollegeName() {
         return collegeName;
     }

paper-library-business/src/main/resources/mapper/DocManageMapper.xml

@@ -38,6 +38,7 @@
             es.college_name collegeName,
             es.major_name majorName,
             es.class_name className,
+            es.exam_room examRoom,
             es.score,
             es.remark,
             es.bind_count bindCount

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

@@ -93,7 +93,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     CommonCacheService commonCacheService;
 
 
-
     @Override
     public IPage<UserDto> listForPrintSystem(String userInfo, Long orgId, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -613,8 +612,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             QueryWrapper<SysRole> sysRoleQueryWrapper = new QueryWrapper<>();
             sysRoleQueryWrapper.lambda().eq(SysRole::getEnable, true)
                     .eq(SysRole::getName, cell);
-            if (Objects.isNull(RoleTypeEnum.convertDescToEnum(cell))) {
-                // 自定义角色带学校id查
+            if (!Objects.isNull(RoleTypeEnum.convertDescToEnum(cell))) {
+                // 内置角色有该角色时，使用内置角色
+                sysRoleQueryWrapper.lambda().isNull(SysRole::getSchoolId);
+            } else {
+                // 内置角色没有，则为自定义角色，使用学校创建角色
                 sysRoleQueryWrapper.lambda().eq(SysRole::getSchoolId, schoolId);
             }
             SysRole sysRole = sysRoleService.getOne(sysRoleQueryWrapper);