Explorar el Código

1、课表增加权限验证接口
2、公告增加权限,可以查看所有人发布的公告

dzx hace 1 año
padre
commit
a4d85ebd07

+ 1 - 1
src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -266,7 +266,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                             .like(!StrUtil.isEmpty(dto.getTeacherName()), XjrUser::getCode, dto.getTeacherName())
             );
             userList.addAll(userList2);
-            if (userList != null && !userList.isEmpty()) {
+            if (!userList.isEmpty()) {
                 XjrUser xjrUser = userList.get(0);
                 dto.setTeacherId(xjrUser.getId());
                 tableVo.setTeacherName(xjrUser.getName());

+ 1 - 1
src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -270,7 +270,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                 .selectAs(Department::getName, ProclamationPageVo::getSendDeptIdCN)
                 .select(News.class, x -> VoToColumnUtil.fieldsToColumns(ProclamationPageVo.class).contains(x.getProperty()))
                 .leftJoin(Department.class, Department::getId, News::getSendDeptId)
-                .eq(News::getCreateUserId, StpUtil.getLoginIdAsLong())
+                .eq(!StpUtil.getRoleList().contains("GongGao"), News::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .eq(News::getTypeId, 2)
                 .like(dto.getFullHead() != null, News::getFullHead, dto.getFullHead())
                 .like(dto.getKeyword() != null, News::getNewsContent, dto.getKeyword())

+ 13 - 0
src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -21,6 +21,7 @@ import com.xjrsoft.module.courseTable.entity.CourseTable;
 import com.xjrsoft.module.courseTable.service.IClassTimeService;
 import com.xjrsoft.module.courseTable.service.ICourseTableService;
 import com.xjrsoft.module.schedule.dto.ClassOptionDto;
+import com.xjrsoft.module.schedule.dto.CourseInfoDto;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
 import com.xjrsoft.module.schedule.dto.CourseTableDto;
 import com.xjrsoft.module.schedule.dto.CourseTablePreCheckDto;
@@ -412,4 +413,16 @@ public class ScheduleController {
 
         return RT.ok(courseAdjustService.cancel(dto));
     }
+
+
+    @GetMapping(value = "/is-contains-all")
+    @ApiOperation(value="判断登录者是否有查看所有课表的权限")
+    @SaCheckPermission("schedule:detail")
+    public RT<Boolean> classList(){
+        if(StpUtil.getRoleList().contains("KeBiao")){
+            return RT.ok(true);
+        }
+        return RT.ok(false);
+    }
+
 }