移代码

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterSchoolController.java

@@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/school")
+@RequestMapping("/register/school")
 public class RegisterSchoolController extends BaseController {
 
     private final IRegisterSchoolService registerSchoolService;
@@ -40,7 +40,7 @@ public class RegisterSchoolController extends BaseController {
     /**
      * 查询注册-学校列表
      */
-    @SaCheckPermission("system:school:list")
+    @SaCheckPermission("register:school:list")
     @GetMapping("/list")
     public TableDataInfo<RegisterSchoolVo> list(RegisterSchoolBo bo, PageQuery pageQuery) {
         return registerSchoolService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class RegisterSchoolController extends BaseController {
     /**
      * 导出注册-学校列表
      */
-    @SaCheckPermission("system:school:export")
+    @SaCheckPermission("register:school:export")
     @Log(title = "注册-学校", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(RegisterSchoolBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class RegisterSchoolController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:school:query")
+    @SaCheckPermission("register:school:query")
     @GetMapping("/{id}")
     public R<RegisterSchoolVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -72,7 +72,7 @@ public class RegisterSchoolController extends BaseController {
     /**
      * 新增注册-学校
      */
-    @SaCheckPermission("system:school:add")
+    @SaCheckPermission("register:school:add")
     @Log(title = "注册-学校", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class RegisterSchoolController extends BaseController {
     /**
      * 修改注册-学校
      */
-    @SaCheckPermission("system:school:edit")
+    @SaCheckPermission("register:school:edit")
     @Log(title = "注册-学校", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")
@@ -96,7 +96,7 @@ public class RegisterSchoolController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:school:remove")
+    @SaCheckPermission("register:school:remove")
     @Log(title = "注册-学校", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterSchoolFileController.java

@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/schoolFile")
+@RequestMapping("/register/file")
 public class RegisterSchoolFileController extends BaseController {
 
     private final IRegisterSchoolFileService registerSchoolFileService;
@@ -39,7 +39,7 @@ public class RegisterSchoolFileController extends BaseController {
     /**
      * 查询注册-学校-附件列表
      */
-    @SaCheckPermission("system:schoolFile:list")
+    @SaCheckPermission("register:file:list")
     @GetMapping("/list")
     public TableDataInfo<RegisterSchoolFileVo> list(RegisterSchoolFileBo bo, PageQuery pageQuery) {
         return registerSchoolFileService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@ public class RegisterSchoolFileController extends BaseController {
     /**
      * 导出注册-学校-附件列表
      */
-    @SaCheckPermission("system:schoolFile:export")
+    @SaCheckPermission("register:file:export")
     @Log(title = "注册-学校-附件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(RegisterSchoolFileBo bo, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class RegisterSchoolFileController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:schoolFile:query")
+    @SaCheckPermission("register:file:query")
     @GetMapping("/{id}")
     public R<RegisterSchoolFileVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -71,7 +71,7 @@ public class RegisterSchoolFileController extends BaseController {
     /**
      * 新增注册-学校-附件
      */
-    @SaCheckPermission("system:schoolFile:add")
+    @SaCheckPermission("register:file:add")
     @Log(title = "注册-学校-附件", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +82,7 @@ public class RegisterSchoolFileController extends BaseController {
     /**
      * 修改注册-学校-附件
      */
-    @SaCheckPermission("system:schoolFile:edit")
+    @SaCheckPermission("register:file:edit")
     @Log(title = "注册-学校-附件", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")
@@ -95,7 +95,7 @@ public class RegisterSchoolFileController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:schoolFile:remove")
+    @SaCheckPermission("register:file:remove")
     @Log(title = "注册-学校-附件", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterTeacherClassController.java

@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/teacherClass")
+@RequestMapping("/register/class")
 public class RegisterTeacherClassController extends BaseController {
 
     private final IRegisterTeacherClassService registerTeacherClassService;
@@ -39,7 +39,7 @@ public class RegisterTeacherClassController extends BaseController {
     /**
      * 查询注册-老师-班级（学科）列表
      */
-    @SaCheckPermission("system:teacherClass:list")
+    @SaCheckPermission("register:class:list")
     @GetMapping("/list")
     public TableDataInfo<RegisterTeacherClassVo> list(RegisterTeacherClassBo bo, PageQuery pageQuery) {
         return registerTeacherClassService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@ public class RegisterTeacherClassController extends BaseController {
     /**
      * 导出注册-老师-班级（学科）列表
      */
-    @SaCheckPermission("system:teacherClass:export")
+    @SaCheckPermission("register:class:export")
     @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(RegisterTeacherClassBo bo, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class RegisterTeacherClassController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:teacherClass:query")
+    @SaCheckPermission("register:class:query")
     @GetMapping("/{id}")
     public R<RegisterTeacherClassVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -71,7 +71,7 @@ public class RegisterTeacherClassController extends BaseController {
     /**
      * 新增注册-老师-班级（学科）
      */
-    @SaCheckPermission("system:teacherClass:add")
+    @SaCheckPermission("register:class:add")
     @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +82,7 @@ public class RegisterTeacherClassController extends BaseController {
     /**
      * 修改注册-老师-班级（学科）
      */
-    @SaCheckPermission("system:teacherClass:edit")
+    @SaCheckPermission("register:class:edit")
     @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")
@@ -95,7 +95,7 @@ public class RegisterTeacherClassController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:teacherClass:remove")
+    @SaCheckPermission("register:class:remove")
     @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/shyj/ZhxyShyjController.java

@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/shyj")
+@RequestMapping("/audit/shyj")
 public class ZhxyShyjController extends BaseController {
 
     private final IZhxyShyjService zhxyShyjService;
@@ -39,7 +39,7 @@ public class ZhxyShyjController extends BaseController {
     /**
      * 查询智慧校园_审核意见列表
      */
-    @SaCheckPermission("system:shyj:list")
+    @SaCheckPermission("audit:shyj:list")
     @GetMapping("/list")
     public TableDataInfo<ZhxyShyjVo> list(ZhxyShyjBo bo, PageQuery pageQuery) {
         return zhxyShyjService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@ public class ZhxyShyjController extends BaseController {
     /**
      * 导出智慧校园_审核意见列表
      */
-    @SaCheckPermission("system:shyj:export")
+    @SaCheckPermission("audit:shyj:export")
     @Log(title = "智慧校园_审核意见", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZhxyShyjBo bo, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class ZhxyShyjController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:shyj:query")
+    @SaCheckPermission("audit:shyj:query")
     @GetMapping("/{id}")
     public R<ZhxyShyjVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -71,7 +71,7 @@ public class ZhxyShyjController extends BaseController {
     /**
      * 新增智慧校园_审核意见
      */
-    @SaCheckPermission("system:shyj:add")
+    @SaCheckPermission("audit:shyj:add")
     @Log(title = "智慧校园_审核意见", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +82,7 @@ public class ZhxyShyjController extends BaseController {
     /**
      * 修改智慧校园_审核意见
      */
-    @SaCheckPermission("system:shyj:edit")
+    @SaCheckPermission("audit:shyj:edit")
     @Log(title = "智慧校园_审核意见", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")
@@ -95,7 +95,7 @@ public class ZhxyShyjController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:shyj:remove")
+    @SaCheckPermission("audit:shyj:remove")
     @Log(title = "智慧校园_审核意见", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java

@@ -57,7 +57,14 @@ public class SysDeptController extends BaseController {
     @GetMapping("/noAuthority/list")
     public R<List<SysDeptVo>> noAuthorityList(SysDeptBo dept)
     {
-        List<SysDeptVo> depts = deptService.selectDeptList(dept);
+        List<SysDeptVo> depts = deptService.selectDeptListChild(dept);
+        return R.ok(depts);
+    }
+
+    @GetMapping("/list/{parentId}")
+    public R<List<SysDeptVo>> listByparentId(@PathVariable(value = "parentId", required = false) Long parentId)
+    {
+        List<SysDeptVo> depts = deptService.selectDeptListChildren(parentId);
         return R.ok(depts);
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -10,6 +10,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.dto.RoleDTO;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
@@ -23,12 +24,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.domain.bo.SysDeptBo;
-import org.dromara.system.domain.bo.SysPostBo;
-import org.dromara.system.domain.bo.SysRoleBo;
-import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.bo.*;
 import org.dromara.system.domain.vo.*;
 import org.dromara.system.listener.SysUserImportListener;
+import org.dromara.system.mapper.FormalTeacherClassMapper;
 import org.dromara.system.service.*;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -55,6 +54,10 @@ public class SysUserController extends BaseController {
     private final ISysDeptService deptService;
     private final ISysTenantService tenantService;
 
+    private final FormalTeacherClassMapper formalTeacherClassMapper;
+
+    private final IFormalParentsStudentService formalParentsStudentService;
+
     /**
      * 获取用户列表
      */
@@ -115,9 +118,43 @@ public class SysUserController extends BaseController {
         userInfoVo.setUser(user);
         userInfoVo.setPermissions(loginUser.getMenuPermission());
         userInfoVo.setRoles(loginUser.getRolePermission());
+
+        if (loginUser.getRoles() != null && loginUser.getRoles().size() > 0){
+            for (RoleDTO role : loginUser.getRoles()) {
+                if ("teacher".equals(role)){
+                    getTeacherClass(userInfoVo);
+                }
+                if("parents".equals(role)){
+                    getParentsStudent(userInfoVo);
+                }
+            }
+        }
+
+        Long schoolId = 0L;
+        if(loginUser.getDeptId()!=null && loginUser.getDeptId()!=0L){
+            schoolId = user.getDeptId();
+        }else{
+            if(userInfoVo.getTeacherClass()!=null && userInfoVo.getTeacherClass().size()>0){
+                schoolId = userInfoVo.getTeacherClass().get(0).getSchoolId();
+            }
+        }
+        userInfoVo.setSchoolId(schoolId);
         return R.ok(userInfoVo);
     }
 
+    private void getTeacherClass(UserInfoVo user) {
+        List<FormalTeacherClassVo> teacherClass = formalTeacherClassMapper.getTeacherClass(String.valueOf(user.getUser().getUserId()));
+        user.setTeacherClass(teacherClass);
+    }
+
+    private void getParentsStudent(UserInfoVo user) {
+
+        FormalParentsStudentBo formalParentsStudent = new FormalParentsStudentBo();
+        formalParentsStudent.setParentsId(user.getUser().getUserId());
+        List<FormalParentsStudentVo> parentsStudent = formalParentsStudentService.queryList(formalParentsStudent);
+        user.setParentsStudent(parentsStudent);
+    }
+
     /**
      * 根据用户编号获取详细信息
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/FormalTeacherClass.java

@@ -70,6 +70,7 @@ public class FormalTeacherClass extends BaseEntity {
     /**
      * 准备放学1,延迟放学 2
      */
+    @TableField(exist = false)
     private String type;
 
     public String getType() {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CourseChangeBo.java

@@ -50,73 +50,73 @@ public class CourseChangeBo extends BaseEntity {
     /**
      * 调课班级id
      */
-    @NotBlank(message = "调课班级id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "调课班级id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long subjectClassId;
 
     /**
      * 调课班级
      */
-    @NotBlank(message = "调课班级不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "调课班级不能为空", groups = { AddGroup.class, EditGroup.class })
     private String subjectClass;
 
     /**
      * 调课科目
      */
-    @NotBlank(message = "调课科目不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "调课科目不能为空", groups = { AddGroup.class, EditGroup.class })
     private String subject;
 
     /**
      * 调课科目是第几节课
      */
-    @NotBlank(message = "调课科目是第几节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "调课科目是第几节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isNum;
 
     /**
      * 调课科目的上课时间
      */
-    @NotNull(message = "调课科目的上课时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "调课科目的上课时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date subjectTime;
 
     /**
      * 周几（调课科目的上课）
      */
-    @NotBlank(message = "周几（调课科目的上课）不能为空", groups = { AddGroup.class, EditGroup.class })
+    ////@NotNull(message = "周几（调课科目的上课）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String subjectWeek;
 
     /**
      * 被调科目老师
      */
-    @NotBlank(message = "被调科目老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    ////@NotNull(message = "被调科目老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bePersonnel;
 
     /**
      * 被调科目老师Id
      */
-    @NotBlank(message = "被调科目老师Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    ////@NotNull(message = "被调科目老师Id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long bePersonnelId;
 
     /**
      * 被调科目
      */
-    @NotBlank(message = "被调科目不能为空", groups = { AddGroup.class, EditGroup.class })
+    ////@NotNull(message = "被调科目不能为空", groups = { AddGroup.class, EditGroup.class })
     private String beSubject;
 
     /**
      * 被调课科目是第几节课
      */
-    @NotBlank(message = "被调课科目是第几节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    ////@NotNull(message = "被调课科目是第几节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String beIsNum;
 
     /**
      * 被调课科目的上课时间
      */
-    @NotNull(message = "被调课科目的上课时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "被调课科目的上课时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date beSubjectTime;
 
     /**
      * 周几（被调课科目的上课）
      */
-    @NotBlank(message = "周几（被调课科目的上课）不能为空", groups = { AddGroup.class, EditGroup.class })
+    ////@NotNull(message = "周几（被调课科目的上课）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String week;
 
     /**
@@ -127,7 +127,7 @@ public class CourseChangeBo extends BaseEntity {
     /**
      * 内容描述
      */
-    @NotBlank(message = "内容描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    ////@NotNull(message = "内容描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
     /**
@@ -153,13 +153,13 @@ public class CourseChangeBo extends BaseEntity {
     /**
      * 学校id
      */
-    @NotBlank(message = "学校id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String schoolId;
+    ////@NotNull(message = "学校id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long schoolId;
 
     /**
      * 学校名称
      */
-    @NotBlank(message = "学校名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    ////@NotNull(message = "学校名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String schoolName;
 
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CourseTableBo.java

@@ -29,133 +29,133 @@ public class CourseTableBo extends BaseEntity {
     /**
      * 学校id
      */
-    @NotBlank(message = "学校id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "学校id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String schoolId;
 
     /**
      * 学校名称
      */
-    @NotBlank(message = "学校名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "学校名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String schoolName;
 
     /**
      * 班级id
      */
-    @NotBlank(message = "班级id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "班级id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String classId;
 
     /**
      * 班级名称
      */
-    @NotBlank(message = "班级名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "班级名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String className;
 
     /**
      * 周几：1：周一，2：周二，3：周三，4：周四，5：周五
      */
-    @NotBlank(message = "周几：1：周一，2：周二，3：周三，4：周四，5：周五不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "周几：1：周一，2：周二，3：周三，4：周四，5：周五不能为空", groups = { AddGroup.class, EditGroup.class })
     private String week;
 
     /**
      * 第一节课
      */
-    @NotBlank(message = "第一节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第一节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String oneClass;
 
     /**
      * 第一节课老师
      */
-    @NotBlank(message = "第一节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第一节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String oneTeacher;
 
     /**
      * 第二节课
      */
-    @NotBlank(message = "第二节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第二节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String twoClass;
 
     /**
      * 第二节课老师
      */
-    @NotBlank(message = "第二节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第二节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String twoTeacher;
 
     /**
      * 第三节课
      */
-    @NotBlank(message = "第三节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第三节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String threeClass;
 
     /**
      * 第三节课老师
      */
-    @NotBlank(message = "第三节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第三节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String threeTeacher;
 
     /**
      * 第四节课
      */
-    @NotBlank(message = "第四节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第四节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fourClass;
 
     /**
      * 第四节课老师
      */
-    @NotBlank(message = "第四节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第四节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fourTeacher;
 
     /**
      * 第五节课
      */
-    @NotBlank(message = "第五节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第五节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fiveClass;
 
     /**
      * 第五节课老师
      */
-    @NotBlank(message = "第五节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第五节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fiveTeacher;
 
     /**
      * 第六节课
      */
-    @NotBlank(message = "第六节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第六节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sixClass;
 
     /**
      * 第六节课老师
      */
-    @NotBlank(message = "第六节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第六节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sixTeacher;
 
     /**
      * 第七节课
      */
-    @NotBlank(message = "第七节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第七节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sevenClass;
 
     /**
      * 第七节课老师
      */
-    @NotBlank(message = "第七节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第七节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sevenTeacher;
 
     /**
      * 第八节课
      */
-    @NotBlank(message = "第八节课不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第八节课不能为空", groups = { AddGroup.class, EditGroup.class })
     private String eightClass;
 
     /**
      * 第八节课老师
      */
-    @NotBlank(message = "第八节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第八节课老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String eightTeacher;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CourseTableTimeBo.java

@@ -29,115 +29,115 @@ public class CourseTableTimeBo extends BaseEntity {
     /**
      * 学校id
      */
-    @NotBlank(message = "学校id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "学校id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String schoolId;
 
     /**
      * 学校名称
      */
-    @NotBlank(message = "学校名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "学校名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String schoolName;
 
     /**
      * 第一节课开始时间
      */
-    @NotBlank(message = "第一节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第一节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String oneStartTime;
 
     /**
      * 第一节课结束时间
      */
-    @NotBlank(message = "第一节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第一节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String oneEndTime;
 
     /**
      * 第二节课开始时间
      */
-    @NotBlank(message = "第二节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第二节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String twoStartTime;
 
     /**
      * 第二节课结束时间
      */
-    @NotBlank(message = "第二节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第二节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String twoEndTime;
 
     /**
      * 第三节课开始时间
      */
-    @NotBlank(message = "第三节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第三节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String threeStartTime;
 
     /**
      * 第三节课结束时间
      */
-    @NotBlank(message = "第三节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第三节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String threeEndTime;
 
     /**
      * 第四节课开始时间
      */
-    @NotBlank(message = "第四节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第四节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fourStartTime;
 
     /**
      * 第四节课结束时间
      */
-    @NotBlank(message = "第四节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第四节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fourEndTime;
 
     /**
      * 第五节课开始时间
      */
-    @NotBlank(message = "第五节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第五节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fiveStartTime;
 
     /**
      * 第五节课结束时间
      */
-    @NotBlank(message = "第五节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第五节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fiveEndTime;
 
     /**
      * 第六节课开始时间
      */
-    @NotBlank(message = "第六节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第六节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sixStartTime;
 
     /**
      * 第六节课结束时间
      */
-    @NotBlank(message = "第六节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第六节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sixEndTime;
 
     /**
      * 第七节课开始时间
      */
-    @NotBlank(message = "第七节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第七节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sevenStartTime;
 
     /**
      * 第七节课结束时间
      */
-    @NotBlank(message = "第七节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第七节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sevenEndTime;
 
     /**
      * 第八节课开始时间
      */
-    @NotBlank(message = "第八节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第八节课开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String eightStartTime;
 
     /**
      * 第八节课结束时间
      */
-    @NotBlank(message = "第八节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "第八节课结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String eightEndTime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java

@@ -2,6 +2,7 @@ package org.dromara.system.domain.vo;
 
 import lombok.Data;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -27,4 +28,13 @@ public class UserInfoVo {
      */
     private Set<String> roles;
 
+    /**
+     * 学校id
+     */
+    private Long schoolId;
+
+    private List<FormalTeacherClassVo> teacherClass;
+
+    private List<FormalParentsStudentVo> parentsStudent;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java

@@ -54,4 +54,5 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
 
     List<SysDeptVo> selectDeptOldList(SysDeptBo dept);
 
+    List<SysDeptVo> selectDeptListMapper(SysDeptBo dept);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java

@@ -116,4 +116,8 @@ public interface ISysDeptService {
     int deleteDeptById(Long deptId);
 
     List<SysDeptVo> selectDeptOldList(SysDeptBo dept);
+
+    List<SysDeptVo> selectDeptListChild(SysDeptBo dept);
+
+    List<SysDeptVo> selectDeptListChildren(Long parentId);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CourseChangeServiceImpl.java

@@ -130,7 +130,7 @@ public class CourseChangeServiceImpl implements ICourseChangeService {
         lqw.eq(bo.getAuditId() != null, CourseChange::getAuditId, bo.getAuditId());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditUser()), CourseChange::getAuditUser, bo.getAuditUser());
         lqw.eq(StringUtils.isNotBlank(bo.getOpinion()), CourseChange::getOpinion, bo.getOpinion());
-        lqw.eq(StringUtils.isNotBlank(bo.getSchoolId()), CourseChange::getSchoolId, bo.getSchoolId());
+        lqw.eq(bo.getSchoolId()!= null, CourseChange::getSchoolId, bo.getSchoolId());
         lqw.like(StringUtils.isNotBlank(bo.getSchoolName()), CourseChange::getSchoolName, bo.getSchoolName());
         lqw.in((bo.getSubjectClassIds()!=null && bo.getSubjectClassIds().size()>0),CourseChange::getSubjectClassId,bo.getSubjectClassIds());
         lqw.orderByDesc(CourseChange::getCreateTime);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -66,6 +66,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         return baseMapper.selectDeptList(lqw);
     }
 
+
     /**
      * 查询部门树结构信息
      *
@@ -344,4 +345,30 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         return baseMapper.selectDeptOldList(dept);
     }
 
+
+    @Override
+    public List<SysDeptVo> selectDeptListChild(SysDeptBo dept) {
+        LoginUser user = LoginHelper.getLoginUser();
+        if(!"admin".equals(user.getUsername())){
+            if(dept.getParentId()==null ||dept.getParentId()==0L){
+                dept.setParentId(user.getDeptId());
+            }
+            dept.setDeptId(user.getDeptId());
+            if(user.getDeptId()==null || user.getDeptId() == 0L){
+                List<FormalTeacherClassVo> teacherClass = formalTeacherClassService.getTeacherClass(String.valueOf(user.getUserId()));
+                if(dept.getParentId()==null ||dept.getParentId()==0L){
+                    dept.setParentId(teacherClass.get(0).getSchoolId());
+                }
+                dept.setDeptId(teacherClass.get(0).getSchoolId());
+            }
+        }
+        return baseMapper.selectDeptListMapper(dept);
+    }
+
+    @Override
+    public List<SysDeptVo> selectDeptListChildren(Long parentId) {
+        return baseMapper.selectDeptListChildren(parentId);
+    }
+
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ZhxyShyjServiceImpl.java

@@ -145,7 +145,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 tenantBo.setContactPhone(registerSchool.getUserPhone());
                 tenantBo.setUsername(registerSchool.getUserPhone());
                 //Todo 租户套餐id
-                tenantBo.setPackageId(0l);
+                tenantBo.setPackageId(1693453896833552386L);
                 SysTenant sysTenant = MapstructUtils.convert(tenantBo, SysTenant.class);
                 // 获取所有租户编号
                 List<String> tenantIds = sysTenantMapper.selectObjs(

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -7,6 +7,11 @@
     <resultMap type="org.dromara.system.domain.vo.SysDeptVo" id="SysDeptResult">
     </resultMap>
 
+    <sql id="selectDeptVo">
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
+        from sys_dept d
+    </sql>
+
     <select id="selectDeptList" resultMap="SysDeptResult">
         select * from sys_dept ${ew.getCustomSqlSegment}
     </select>
@@ -34,7 +39,7 @@
     </select>
     <select id="selectDeptListChildren" resultMap="SysDeptResult" parameterType="SysDept">
         select * from sys_dept
-        where d.del_flag = '0'
+        where del_flag = '0'
         AND parent_id = #{parentId}
         AND status = '0'
     </select>
@@ -55,6 +60,23 @@
         </if>
         order by parent_id, order_num
     </select>
+    <select id="selectDeptListMapper" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+        where d.del_flag = '0'
+        <if test="parentId != null and parentId != 0">
+            AND (dept_id = #{deptId} or parent_id = #{parentId})
+        </if>
+        <!--<if test="parentId != null and parentId != 0">
+			AND parent_id = #{parentId}
+		</if>-->
+        <if test="deptName != null and deptName != ''">
+            AND dept_name like concat('%', #{deptName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND status = #{status}
+        </if>
+        order by d.parent_id, d.order_num
+    </select>
 
     <insert id="insertDeptList">
         insert into sys_dept(parent_id,dept_name,ancestors,order_num,status,create_time) values