移代码

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

@@ -51,7 +51,7 @@ public class ScoreDataController extends BaseController {
     /**
      * 查询成绩列表
      */
-    @SaCheckPermission("score:score:list")
+    @SaCheckPermission("score:data:list")
     @GetMapping("/list")
     public TableDataInfo<ScoreDataVo> list(ScoreDataBo bo, PageQuery pageQuery) {
         return scoreDataService.queryPageList(bo, pageQuery);
@@ -60,7 +60,7 @@ public class ScoreDataController extends BaseController {
     /**
      * 导出成绩列表
      */
-    @SaCheckPermission("score:score:export")
+    @SaCheckPermission("score:data:export")
     @Log(title = "成绩", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ScoreDataBo bo, HttpServletResponse response) {
@@ -74,7 +74,7 @@ public class ScoreDataController extends BaseController {
      * @param file          导入文件
      * @param updateSupport 是否更新已存在数据
      */
-    @SaCheckPermission("score:score:add")
+    @SaCheckPermission("score:data:add")
     @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
         ExcelResult<ScoreDataVo> result = ExcelUtil.importExcel(file.getInputStream(), ScoreDataVo.class, new ScoreDataListener(updateSupport));
@@ -86,7 +86,7 @@ public class ScoreDataController extends BaseController {
      *
      * @param scoreId 主键
      */
-    @SaCheckPermission("score:score:query")
+    @SaCheckPermission("score:data:query")
     @GetMapping("/{scoreId}")
     public R<ScoreDataVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long scoreId) {
@@ -106,7 +106,7 @@ public class ScoreDataController extends BaseController {
     /**
      * 新增成绩
      */
-    @SaCheckPermission("score:score:add")
+    @SaCheckPermission("score:data:add")
     @Log(title = "成绩", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/add")
@@ -117,7 +117,7 @@ public class ScoreDataController extends BaseController {
     /**
      * 修改成绩
      */
-    @SaCheckPermission("score:score:edit")
+    @SaCheckPermission("score:data:edit")
     @Log(title = "成绩", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")
@@ -130,7 +130,7 @@ public class ScoreDataController extends BaseController {
      *
      * @param scoreIds 主键串
      */
-    @SaCheckPermission("score:score:remove")
+    @SaCheckPermission("score:data:remove")
     @Log(title = "成绩", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{scoreIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -148,4 +148,19 @@ public class SysDeptController extends BaseController {
         deptService.checkDeptDataScope(deptId);
         return toAjax(deptService.deleteDeptById(deptId));
     }
+
+    @GetMapping("/pc/self/list")
+    public R<List<SysDeptVo>> pcSelfList(SysDeptBo dept)
+    {
+        List<SysDeptVo> depts = deptService.pcSelfList(dept);
+        return R.ok(depts);
+    }
+
+    @GetMapping("/app/self/list")
+    public R<List<SysDeptVo>> appSelfList(SysDeptBo dept)
+    {
+        List<SysDeptVo> depts = deptService.appSelfList(dept);
+        return R.ok(depts);
+    }
+
 }

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

@@ -27,6 +27,8 @@ public class FormalParentsStudent extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    private String tenantId;
+
     /**
      * 家长id
      */

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

@@ -27,6 +27,11 @@ public class FormalTeacherClass extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 老师id
      */

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

@@ -26,6 +26,8 @@ public class SysRole extends TenantEntity {
     @TableId(value = "role_id")
     private Long roleId;
 
+    private String tenantId;
+
     /**
      * 角色名称
      */

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

@@ -12,6 +12,8 @@ import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 部门业务对象 sys_dept
  *

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

@@ -4,6 +4,7 @@ import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import org.dromara.system.domain.SysRole;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -23,14 +24,17 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = SysRole.class, reverseConvertGenerate = false)
-public class SysRoleBo extends BaseEntity {
+public class SysRoleBo extends TenantEntity {
 
     /**
      * 角色ID
      */
-    @NotNull(message = "角色ID不能为空", groups = { EditGroup.class })
+    //@NotBlank(message = "角色ID不能为空", groups = { EditGroup.class })
     private Long roleId;
 
+    private String tenantId;
+
+
     /**
      * 角色名称
      */
@@ -48,7 +52,7 @@ public class SysRoleBo extends BaseEntity {
     /**
      * 显示顺序
      */
-    @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer roleSort;
 
     /**

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

@@ -29,7 +29,7 @@ public interface FormalTeacherClassMapper extends BaseMapperPlus<FormalTeacherCl
      * @param formalTeacherClass 老师-班级（学科）(审核通过之后数据)
      * @return 老师-班级（学科）(审核通过之后数据)集合
      */
-    public List<FormalTeacherClass> selectFormalTeacherClassList(FormalTeacherClass formalTeacherClass);
+    public List<FormalTeacherClassVo> selectFormalTeacherClassList(FormalTeacherClass formalTeacherClass);
 
     /**
      * 新增老师-班级（学科）(审核通过之后数据)
@@ -67,4 +67,6 @@ public interface FormalTeacherClassMapper extends BaseMapperPlus<FormalTeacherCl
     public List<FormalTeacherClassVo> getTeacherClass(String teacherId);
 
     void deleteFormalTeacherClassByTeacherId(Long userId);
+
+    List<FormalTeacherClassVo> queryMapperList(FormalTeacherClassBo formalTeacherClass);
 }

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

@@ -5,6 +5,8 @@ import org.dromara.system.domain.RegisterParents;
 import org.dromara.system.domain.vo.RegisterParentsVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.Collection;
+
 /**
  * 注册-家长Mapper接口
  *
@@ -18,4 +20,13 @@ public interface RegisterParentsMapper extends BaseMapperPlus<RegisterParents, R
 
     @InterceptorIgnore(tenantLine = "1")
     RegisterParentsVo selectRegisterParentsByPhonenumber(String phonenumber);
+
+    @InterceptorIgnore(tenantLine = "1")
+    Long updateMapperById(RegisterParents update);
+
+    @InterceptorIgnore(tenantLine = "1")
+    Long deleteMapperBatchIds(Collection<Long> ids);
+
+    @InterceptorIgnore(tenantLine = "1")
+    RegisterParentsVo selectMapperById(Long id);
 }

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

@@ -3,6 +3,7 @@ package org.dromara.system.mapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.RegisterParentsStudent;
 import org.dromara.system.domain.vo.RegisterParentsStudentVo;
@@ -24,10 +25,16 @@ public interface RegisterParentsStudentMapper extends BaseMapperPlus<RegisterPar
      * @param parentsId 家长id
      * @return 结果
      */
+    @InterceptorIgnore(tenantLine = "1")
     void deleteRegisterParentsStudentByParentsId(Long parentsId);
 
+    @InterceptorIgnore(tenantLine = "1")
     List<RegisterParentsStudentVo> selectRegisterParentsStudentListByTime(@Param("monthFirst") String monthFirst, @Param("classIds")List<Long> classIds);
 
     @InterceptorIgnore(tenantLine = "1")
     List<RegisterParentsStudentVo> selectVoMapperList( @Param(Constants.WRAPPER)LambdaQueryWrapper<RegisterParentsStudent> lqw);
+
+    Long updateMapperById(RegisterParentsStudent update);
+
+    Page<RegisterParentsStudentVo> selectVoMapperPage(@Param("page")Page<Object> build, @Param(Constants.WRAPPER)LambdaQueryWrapper<RegisterParentsStudent> lqw);
 }

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

@@ -1,6 +1,10 @@
 package org.dromara.system.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.RegisterSchool;
 import org.dromara.system.domain.vo.RegisterSchoolVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -23,4 +27,10 @@ public interface RegisterSchoolMapper extends BaseMapperPlus<RegisterSchool, Reg
 
     @InterceptorIgnore(tenantLine = "1")
     void deleteRegisterSchoolByPhonenumber(String phonenumber);
+
+    @InterceptorIgnore(tenantLine = "1")
+    RegisterSchoolVo selectVoMapperById(Long id);
+
+    @InterceptorIgnore(tenantLine = "1")
+    Page<RegisterSchoolVo> selectVoMapperPage(@Param("page")Page<Object> build, @Param(Constants.WRAPPER)LambdaQueryWrapper<RegisterSchool> lqw);
 }

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

@@ -1,9 +1,15 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.RegisterTeacherClass;
 import org.dromara.system.domain.vo.RegisterTeacherClassVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 注册-老师-班级（学科）Mapper接口
  *
@@ -15,4 +21,7 @@ public interface RegisterTeacherClassMapper extends BaseMapperPlus<RegisterTeach
     void deleteRegisterTeacherClassByTeacherId(Long teacherId);
 
     void deleteRegisterTeacherClassByTeacherIds(Long[] ids);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<RegisterTeacherClassVo> selectVoMapperList(@Param(Constants.WRAPPER)LambdaQueryWrapper<RegisterTeacherClass> lqw);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.RegisterTeacher;
 import org.dromara.system.domain.vo.RegisterTeacherVo;
@@ -26,5 +27,11 @@ public interface RegisterTeacherMapper extends BaseMapperPlus<RegisterTeacher, R
     RegisterTeacherVo selectRegisterTeacherByPhonenumber(String phonenumber);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<RegisterTeacherVo> selectListZ(IPage<RegisterTeacher> page, @Param(Constants.WRAPPER)LambdaQueryWrapper<RegisterTeacher> lqw);
+    List<RegisterTeacherVo> selectListZ(@Param("page")IPage<RegisterTeacher> page, @Param(Constants.WRAPPER)LambdaQueryWrapper<RegisterTeacher> lqw);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Long updateMapperById(RegisterTeacher update);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Page<RegisterTeacherVo> selectVoMapperPage(@Param("page")Page<Object> build, @Param(Constants.WRAPPER)LambdaQueryWrapper<RegisterTeacher> lqw);
 }

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

@@ -65,4 +65,7 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
 
     @InterceptorIgnore(tenantLine = "true")
     SysDeptVo selectDeptByIdNoTenantId(Long deptId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<SysDeptVo> selectDeptListMapperByIdList(List<Long> deptIdList);
 }

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

@@ -120,4 +120,8 @@ public interface ISysDeptService {
     List<SysDeptVo> selectDeptListChild(SysDeptBo dept);
 
     List<SysDeptVo> selectDeptListChildren(Long parentId);
+
+    List<SysDeptVo> pcSelfList(SysDeptBo dept);
+
+    List<SysDeptVo> appSelfList(SysDeptBo dept);
 }

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

@@ -180,4 +180,6 @@ public interface ISysRoleService {
     int insertAuthUsers(Long roleId, Long[] userIds);
 
     void cleanOnlineUserByRole(Long roleId);
+
+    int insertRoleCx(SysRoleBo role);
 }

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

@@ -114,7 +114,6 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
         if(registerParentsStudentList!=null && registerParentsStudentList.size()>0){
             for (RegisterParentsStudentVo registerParentsStudent : registerParentsStudentList) {
                 registerParentsStudent.setParentsId(bo.getId());
-                registerParentsStudent.setTenantId(bo.getTenantId());
                 registerParentsStudent.setParentsName(bo.getUserName());
                 registerParentsStudent.setParentsPhone(bo.getUserPhone());
                 registerParentsStudent.setCreateTime(DateUtils.getNowDate());
@@ -161,7 +160,7 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
         bo.setUpdateTime(DateUtils.getNowDate());
         RegisterParents update = MapstructUtils.convert(bo, RegisterParents.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return baseMapper.updateMapperById(update) > 0;
     }
 
     /**
@@ -179,6 +178,6 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return baseMapper.deleteBatchIds(ids) > 0;
+        return baseMapper.deleteMapperBatchIds(ids) > 0;
     }
 }

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

@@ -15,6 +15,7 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.FormalTeacherClass;
 import org.dromara.system.domain.bo.FormalTeacherClassBo;
 import org.dromara.system.domain.vo.FormalTeacherClassVo;
+import org.dromara.system.mapper.FormalTeacherClassMapper;
 import org.dromara.system.service.IFormalTeacherClassService;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.RegisterParentsStudentBo;
@@ -42,6 +43,8 @@ public class RegisterParentsStudentServiceImpl implements IRegisterParentsStuden
 
     private final IFormalTeacherClassService formalTeacherClassService;
 
+    private final FormalTeacherClassMapper formalTeacherClassMapper;
+
     /**
      * 查询注册-家长-学生
      */
@@ -70,14 +73,14 @@ public class RegisterParentsStudentServiceImpl implements IRegisterParentsStuden
             //查询老师班级
             FormalTeacherClassBo formalTeacherClass = new FormalTeacherClassBo();
             formalTeacherClass.setTeacherId(loginUser.getUserId());
-            List<FormalTeacherClassVo> formalTeacherClassList = formalTeacherClassService.queryList(formalTeacherClass);
+            List<FormalTeacherClassVo> formalTeacherClassList = formalTeacherClassMapper.queryMapperList(formalTeacherClass);
             List<Long> classIds = formalTeacherClassList.stream().map(FormalTeacherClassVo::getClassId).collect(Collectors.toList());
             bo.setClassIds(classIds);
         }
 
 
         LambdaQueryWrapper<RegisterParentsStudent> lqw = buildQueryWrapper(bo);
-        Page<RegisterParentsStudentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<RegisterParentsStudentVo> result = baseMapper.selectVoMapperPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -135,7 +138,7 @@ public class RegisterParentsStudentServiceImpl implements IRegisterParentsStuden
 
         RegisterParentsStudent update = MapstructUtils.convert(bo, RegisterParentsStudent.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return baseMapper.updateMapperById(update) > 0;
     }
 
     /**

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

@@ -60,7 +60,7 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService {
     @Override
     public RegisterSchoolVo queryById(Long id){
 
-        RegisterSchoolVo registerSchool = baseMapper.selectVoById(id);
+        RegisterSchoolVo registerSchool = baseMapper.selectVoMapperById(id);
         RegisterSchoolFileBo registerSchoolFile = new RegisterSchoolFileBo();
         registerSchoolFile.setSchoolId(id);
         List<RegisterSchoolFileVo> registerSchoolFileList = registerSchoolFileService.queryList(registerSchoolFile);
@@ -74,7 +74,7 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService {
     @Override
     public TableDataInfo<RegisterSchoolVo> queryPageList(RegisterSchoolBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<RegisterSchool> lqw = buildQueryWrapper(bo);
-        Page<RegisterSchoolVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<RegisterSchoolVo> result = baseMapper.selectVoMapperPage(pageQuery.build(), lqw);
         if(result.getRecords().size()>0){
             for (RegisterSchoolVo school : result.getRecords()) {
                 RegisterSchoolFileBo registerSchoolFile = new RegisterSchoolFileBo();

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

@@ -56,7 +56,7 @@ public class RegisterTeacherClassServiceImpl implements IRegisterTeacherClassSer
     @Override
     public List<RegisterTeacherClassVo> queryList(RegisterTeacherClassBo bo) {
         LambdaQueryWrapper<RegisterTeacherClass> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectVoMapperList(lqw);
     }
 
     private LambdaQueryWrapper<RegisterTeacherClass> buildQueryWrapper(RegisterTeacherClassBo bo) {

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

@@ -77,7 +77,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
     @Override
     public TableDataInfo<RegisterTeacherVo> queryPageList(RegisterTeacherBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<RegisterTeacher> lqw = buildQueryWrapper(bo);
-        Page<RegisterTeacherVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<RegisterTeacherVo> result = baseMapper.selectVoMapperPage(pageQuery.build(), lqw);
         if (result.getRecords() != null && result.getRecords().size() > 0) {
             for (RegisterTeacherVo teacher : result.getRecords()) {
                 RegisterTeacherClassBo registerTeacherClass = new RegisterTeacherClassBo();
@@ -89,15 +89,6 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
         return TableDataInfo.build(result);
     }
 
-    /*private Page<RegisterTeacherVo> selectVoPage(IPage<RegisterTeacher> page, LambdaQueryWrapper<RegisterTeacher> lqw) {
-        List<RegisterTeacherVo> list = baseMapper.selectListZ(page, lqw);
-        IPage<RegisterTeacherVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
-        if (CollUtil.isEmpty(list)) {
-            return (Page<RegisterTeacherVo>) voPage;
-        }
-        voPage.setRecords(list);
-        return (Page<RegisterTeacherVo>) voPage;
-    }*/
 
 
     /**
@@ -243,7 +234,9 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
     /**
      * 修改注册-老师
      */
+    @SneakyThrows
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(RegisterTeacherBo bo) {
 
         //删除注册表-老师-班级（学科）表
@@ -256,7 +249,8 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
                 String className = registerTeacherClass.getClassName();
                 int period = getPeriod(className);
                 registerTeacherClass.setPeriod(String.valueOf(period));
-                RegisterTeacherClassBo registerTeacherClassBo = MapstructUtils.convert(registerTeacherClass, RegisterTeacherClassBo.class);
+                RegisterTeacherClassBo registerTeacherClassBo = new RegisterTeacherClassBo();
+                ClassUtils.copyProperties(registerTeacherClass, registerTeacherClassBo);
                 registerTeacherClassService.insertByBo(registerTeacherClassBo);
             }
         }
@@ -265,7 +259,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
 
         RegisterTeacher update = MapstructUtils.convert(bo, RegisterTeacher.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return baseMapper.updateMapperById(update) > 0;
     }
 
     /**

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

@@ -91,7 +91,7 @@ public class StudentInfoServiceImpl implements IStudentInfoService {
     private QueryWrapper<StudentInfo> buildQueryWrapper(StudentInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         QueryWrapper<StudentInfo> lqw = Wrappers.query();
-        lqw.eq(bo.getStudentId() != null, "s.student_id", bo.getStudentId());
+        lqw.eq(bo.getStudentId() != null && bo.getParentsId()!= 0L, "s.student_id", bo.getStudentId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), "s.name", bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getSex()), "s.sex", bo.getSex());
         lqw.eq(StringUtils.isNotBlank(bo.getAge()), "s.age", bo.getAge());
@@ -120,7 +120,7 @@ public class StudentInfoServiceImpl implements IStudentInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getIsLset()), "s.is_lset", bo.getIsLset());
         lqw.eq(StringUtils.isNotBlank(bo.getIsPoverty()), "s.is_poverty", bo.getIsPoverty());
         lqw.eq(StringUtils.isNotBlank(bo.getClassId()), "f.class_id", bo.getClassId());
-        lqw.eq(StringUtils.isNotBlank(bo.getClassId()), "f.parents_id", bo.getParentsId());
+        lqw.eq(bo.getParentsId()!= null && bo.getParentsId()!= 0L, "f.parents_id", bo.getParentsId());
         lqw.orderByDesc("s.create_time");
         return lqw;
     }

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

@@ -22,9 +22,11 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.SysRole;
 import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.FormalTeacherClassBo;
 import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.vo.FormalTeacherClassVo;
 import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.mapper.FormalTeacherClassMapper;
 import org.dromara.system.mapper.SysDeptMapper;
 import org.dromara.system.mapper.SysRoleMapper;
 import org.dromara.system.mapper.SysUserMapper;
@@ -38,6 +40,8 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 部门管理 服务实现
@@ -52,7 +56,8 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     private final SysRoleMapper roleMapper;
     private final SysUserMapper userMapper;
 
-    private IFormalTeacherClassService formalTeacherClassService;
+    private final IFormalTeacherClassService formalTeacherClassService;
+    private final FormalTeacherClassMapper formalTeacherClassMapper;
 
     /**
      * 查询部门管理数据
@@ -371,4 +376,59 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     }
 
 
+    @Override
+    public List<SysDeptVo> pcSelfList(SysDeptBo dept) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+
+        if("admin".equals(loginUser.getUsername())){
+            return baseMapper.selectDeptListMapper(dept);
+        }else {
+            if("school".equals(loginUser.getUsername())){
+                dept.setDeptId(loginUser.getDeptId());
+                dept.setParentId(loginUser.getDeptId());
+                return baseMapper.selectDeptListMapper(dept);
+            }else if("teacher".equals(loginUser.getUsername())){
+                //查询老师的班级
+                FormalTeacherClassBo bo = new FormalTeacherClassBo();
+                bo.setTeacherId(loginUser.getUserId());
+                List<FormalTeacherClassVo> teacherClass = formalTeacherClassService.getTeacherClass(String.valueOf(loginUser.getUserId()));
+                List<Long> deptIdList = teacherClass.stream().map(FormalTeacherClassVo::getClassId).collect(Collectors.toList());
+                deptIdList.add(loginUser.getDeptId());
+                return baseMapper.selectDeptListMapperByIdList(deptIdList);
+            }
+            return new ArrayList<>();
+        }
+    }
+
+
+    @Override
+    public List<SysDeptVo> appSelfList(SysDeptBo dept) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+
+        Map<String, Object> params = dept.getParams();
+        String role = "";
+        if (params != null && params.size() > 0) {
+            role = (String) params.get("role");
+        }
+        if("admin".equals(loginUser.getUsername())){
+            return baseMapper.selectDeptListMapper(dept);
+        }else {
+            if("school".equals(role)){
+                dept.setDeptId(loginUser.getDeptId());
+                dept.setParentId(loginUser.getDeptId());
+                return baseMapper.selectDeptListMapper(dept);
+            }else if("teacher".equals(role)){
+                //查询老师的班级
+                FormalTeacherClassBo bo = new FormalTeacherClassBo();
+                bo.setTeacherId(loginUser.getUserId());
+                List<FormalTeacherClassVo> teacherClass = formalTeacherClassService.getTeacherClass(String.valueOf(loginUser.getUserId()));
+                List<Long> deptIdList = teacherClass.stream().map(FormalTeacherClassVo::getClassId).collect(Collectors.toList());
+                deptIdList.add(loginUser.getDeptId());
+                return baseMapper.selectDeptListMapperByIdList(deptIdList);
+            }
+            return new ArrayList<>();
+        }
+    }
+
+
 }

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

@@ -481,4 +481,15 @@ public class SysRoleServiceImpl implements ISysRoleService {
             }
         });
     }
+
+    @Override
+    public int insertRoleCx(SysRoleBo bo) {
+        List<SysRole> sysRoleList = new ArrayList<>();
+        SysRole role = MapstructUtils.convert(bo, SysRole.class);
+        sysRoleList.add(role);
+        // 新增角色信息
+        baseMapper.insertBatch(sysRoleList);
+        bo.setRoleId(role.getRoleId());
+        return insertRoleMenu(bo);
+    }
 }

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

@@ -35,6 +35,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -568,4 +569,31 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             .select(SysUser::getUserName).eq(SysUser::getUserId, userId));
         return ObjectUtil.isNull(sysUser) ? null : sysUser.getUserName();
     }
+
+    public void insertUserRoleNoTenantId(Long userId, Long[] roleIds, boolean clear) {
+        if (ArrayUtil.isNotEmpty(roleIds)) {
+            // 判断是否具有此角色的操作权限
+            List<SysRoleVo> roles = roleMapper.selectRoleList(new LambdaQueryWrapper<>());
+            if (CollUtil.isEmpty(roles)) {
+                throw new ServiceException("没有权限访问角色的数据");
+            }
+            List<Long> roleList = StreamUtils.toList(roles, SysRoleVo::getRoleId);
+            if (!LoginHelper.isSuperAdmin(userId)) {
+                roleList.remove(UserConstants.SUPER_ADMIN_ID);
+            }
+            List<Long> canDoRoleList = Arrays.asList(roleIds);
+            if (clear) {
+                // 删除用户与角色关联
+                userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
+            }
+            // 新增用户与角色管理
+            List<SysUserRole> list = StreamUtils.toList(canDoRoleList, roleId -> {
+                SysUserRole ur = new SysUserRole();
+                ur.setUserId(userId);
+                ur.setRoleId(roleId);
+                return ur;
+            });
+            userRoleMapper.insertBatch(list);
+        }
+    }
 }

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

@@ -211,7 +211,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     }
                 }
                 Long[] roleIds = {roleId};
-                sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds,false);
+                sysUserServiceImpl.insertUserRoleNoTenantId(use.getUserId(), roleIds,false);
             }else{
                 //不通过  修改注册表审核结果
                 //修改注册表审核结果
@@ -256,7 +256,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     use.setPhonenumber(registerTeacher.getUserPhone());
                     use.setPassword(BCrypt.hashpw("1qaz!QAZ"));
                     use.setCreateTime(DateUtils.getNowDate());
-                    use.setTenantId(sysDept.getTenantId());
+                    use.setTenantId(registerTeacher.getTenantId());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
                     userMapper.insert(sysUser);
                     use.setUserId(sysUser.getUserId());
@@ -264,16 +264,17 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     use.setDeptId(registerTeacher.getSchoolId());
                     use.setTenantId(sysDept.getTenantId());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
-                    userMapper.insert(sysUser);
+                    userMapper.updateById(sysUser);
                 }
 
                 //新增用户与角色管理
                 Long roleId = sysRoleMapper.selectRoleIdBytenantId(sysDept.getTenantId(),"teacher");
                 Long[] roleIds = {roleId};
-                sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds,false);
+                sysUserServiceImpl.insertUserRoleNoTenantId(use.getUserId(), roleIds,false);
                 //老师-班级（学科）数据
                 for (RegisterTeacherClassVo teacherClass : registerTeacherClassList) {
                     FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+                    formalTeacherClass.setTenantId(registerTeacher.getTenantId());
                     formalTeacherClass.setTeacherId(use.getUserId());
                     formalTeacherClass.setTeacherName(use.getNickName());
                     formalTeacherClass.setSchoolId(registerTeacher.getSchoolId());
@@ -302,7 +303,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
             //家长注册
             //查询数据信息
             RegisterParentsStudentVo registerParentsStudent = registerParentsStudentMapper.selectVoById(bo.getDataId());
-            RegisterParentsVo registerParents = registerParentsMapper.selectVoById(registerParentsStudent.getParentsId());
+            RegisterParentsVo registerParents = registerParentsMapper.selectMapperById(registerParentsStudent.getParentsId());
             if ("2".equals(bo.getShjg())) {
 
                 //通过  修改注册表审核结果，生成账号， 新增用户与角色管理，家长-学生(审核通过之后数据)
@@ -338,7 +339,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     sysUser.setUserId(use.getUserId());
                     //新增用户与角色管理
                     Long[] roleIds = {5L};
-                    sysUserServiceImpl.insertUserRole(sysUser.getUserId(), roleIds,false);
+                    sysUserServiceImpl.insertUserRoleNoTenantId(sysUser.getUserId(), roleIds,false);
                 } else {
                     FormalParentsStudentBo parentsStudent = new FormalParentsStudentBo();
                     parentsStudent.setParentsId(sysUser.getUserId());
@@ -346,7 +347,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     if (parentsStudentList == null || parentsStudentList.size() <= 0) {
                         //新增用户与角色管理
                         Long[] roleIds = {5L};
-                        sysUserServiceImpl.insertUserRole(sysUser.getUserId(), roleIds,false);
+                        sysUserServiceImpl.insertUserRoleNoTenantId(sysUser.getUserId(), roleIds,false);
                     }
                 }
 
@@ -355,6 +356,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 formalParentsStudent.setParentsId(sysUser.getUserId());
                 formalParentsStudent.setSchoolId(registerParentsStudent.getSchoolId());
                 formalParentsStudent.setSchoolName(registerParentsStudent.getSchoolName());
+                formalParentsStudent.setTenantId(registerParentsStudent.getTenantId());
                 formalParentsStudent.setClassId(registerParentsStudent.getClassId());
                 formalParentsStudent.setClassName(registerParentsStudent.getClassName());
                 formalParentsStudent.setStudentName(registerParentsStudent.getStudentName());

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

@@ -13,6 +13,7 @@ import org.dromara.system.domain.*;
 import org.dromara.system.domain.notice.XiaoyuanNotice;
 import org.dromara.system.domain.notice.vo.XiaoyuanNoticeVo;
 import org.dromara.system.domain.vo.CourseChangeVo;
+import org.dromara.system.domain.vo.FormalTeacherClassVo;
 import org.dromara.system.domain.vo.RegisterParentsStudentVo;
 import org.dromara.system.domain.vo.RegisterTeacherVo;
 import org.dromara.system.domain.xiake.XiakeConfig;
@@ -210,8 +211,8 @@ public class AppletServiceImpl implements IAppletService {
             //获取老师所属班级
             FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
             formalTeacherClass.setTeacherId(loginUser.getUserId());
-            List<FormalTeacherClass> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
-            List<Long> classIds = formalTeacherClasses.stream().map(FormalTeacherClass::getClassId).collect(Collectors.toList());
+            List<FormalTeacherClassVo> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+            List<Long> classIds = formalTeacherClasses.stream().map(FormalTeacherClassVo::getClassId).collect(Collectors.toList());
             //查询本月家长的审核数据
             List<RegisterParentsStudentVo> registerParentsStudentList = registerParentsStudentMapper.selectRegisterParentsStudentListByTime(monthFirst,classIds);
             if(registerParentsStudentList!=null && registerParentsStudentList.size()>0){

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

@@ -23,6 +23,7 @@ import org.dromara.system.domain.FormalTeacherClass;
 import org.dromara.system.domain.notice.XiaoyuanNotice;
 import org.dromara.system.domain.notice.bo.XiaoyuanNoticeBo;
 import org.dromara.system.domain.notice.vo.XiaoyuanNoticeVo;
+import org.dromara.system.domain.vo.FormalTeacherClassVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.mapper.FormalParentsStudentMapper;
 import org.dromara.system.mapper.FormalTeacherClassMapper;
@@ -76,9 +77,9 @@ public class XiaoyuanNoticeServiceImpl implements IXiaoyuanNoticeService {
         if ("teacher".equals(role)) {
             FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
             formalTeacherClass.setTeacherId(LoginHelper.getUserId());
-            List<FormalTeacherClass> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+            List<FormalTeacherClassVo> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
             if (formalTeacherClasses != null && formalTeacherClasses.size() > 0) {
-                for (FormalTeacherClass teacherClass : formalTeacherClasses) {
+                for (FormalTeacherClassVo teacherClass : formalTeacherClasses) {
                     classId.append(teacherClass.getClassId()).append(",");
                 }
             }

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

@@ -16,6 +16,7 @@ import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.record.RecordLeave;
 import org.dromara.system.domain.record.bo.RecordLeaveBo;
 import org.dromara.system.domain.record.vo.RecordLeaveVo;
+import org.dromara.system.domain.vo.FormalTeacherClassVo;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.mapper.FormalParentsStudentMapper;
 import org.dromara.system.mapper.FormalTeacherClassMapper;
@@ -69,9 +70,9 @@ public class RecordLeaveServiceImpl implements IRecordLeaveService {
         if ("teacher".equals(role)) {
             FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
             formalTeacherClass.setTeacherId(LoginHelper.getUserId());
-            List<FormalTeacherClass> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+            List<FormalTeacherClassVo> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
             if (formalTeacherClasses != null && formalTeacherClasses.size() > 0) {
-                for (FormalTeacherClass teacherClass : formalTeacherClasses) {
+                for (FormalTeacherClassVo teacherClass : formalTeacherClasses) {
                     classId.append(teacherClass.getClassId()).append(",");
                 }
             }

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

@@ -30,6 +30,7 @@ import org.dromara.system.domain.score.vo.ScoreDataDetailVo;
 import org.dromara.system.domain.score.vo.ScoreDataMfVo;
 import org.dromara.system.domain.score.vo.ScoreDataStudentVo;
 import org.dromara.system.domain.score.vo.ScoreDataVo;
+import org.dromara.system.domain.vo.FormalTeacherClassVo;
 import org.dromara.system.mapper.FormalParentsStudentMapper;
 import org.dromara.system.mapper.FormalTeacherClassMapper;
 import org.dromara.system.mapper.score.ScoreDataDetailMapper;
@@ -90,9 +91,9 @@ public class ScoreDataServiceImpl implements IScoreDataService {
         if ("teacher".equals(role)) {
             FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
             formalTeacherClass.setTeacherId(LoginHelper.getUserId());
-            List<FormalTeacherClass> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+            List<FormalTeacherClassVo> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
             if (formalTeacherClasses != null && formalTeacherClasses.size() > 0) {
-                for (FormalTeacherClass teacherClass : formalTeacherClasses) {
+                for (FormalTeacherClassVo teacherClass : formalTeacherClasses) {
                     classId.append(teacherClass.getClassId()).append(",");
                 }
             }

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

@@ -1,37 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.FormalTeacherClassMapper">
     <resultMap type="org.dromara.system.domain.vo.FormalTeacherClassVo" id="FormalTeacherClassResult">
-        <result property="id"    column="id"    />
-        <result property="teacherId"    column="teacher_id"    />
-        <result property="teacherName"    column="teacher_name"    />
-        <result property="schoolId"    column="school_id"    />
-        <result property="schoolName"    column="school_name"    />
-        <result property="classId"    column="class_id"    />
-        <result property="className"    column="class_name"    />
-        <result property="discipline"    column="discipline"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="teacherId" column="teacher_id"/>
+        <result property="teacherName" column="teacher_name"/>
+        <result property="schoolId" column="school_id"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="classId" column="class_id"/>
+        <result property="className" column="class_name"/>
+        <result property="discipline" column="discipline"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectFormalTeacherClassVo">
-        select id, teacher_id,teacher_name, school_id, school_name, class_id, class_name, discipline, create_by, create_time, update_by, update_time, remark from formal_teacher_class
+        select id,
+               teacher_id,
+               teacher_name,
+               school_id,
+               school_name,
+               class_id,
+               class_name,
+               discipline,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from formal_teacher_class
     </sql>
 
     <select id="selectFormalTeacherClassList" parameterType="FormalTeacherClass" resultMap="FormalTeacherClassResult">
         <include refid="selectFormalTeacherClassVo"/>
         <where>
-            <if test="teacherId != null  and teacherId != ''"> and teacher_id = #{teacherId}</if>
-            <if test="schoolId != null  and schoolId != ''"> and school_id = #{schoolId}</if>
-            <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
-            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
-            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
-            <if test="discipline != null  and discipline != ''"> and discipline = #{discipline}</if>
+            <if test="teacherId != null  and teacherId != ''">and teacher_id = #{teacherId}</if>
+            <if test="schoolId != null  and schoolId != ''">and school_id = #{schoolId}</if>
+            <if test="schoolName != null  and schoolName != ''">and school_name like concat('%', #{schoolName}, '%')
+            </if>
+            <if test="classId != null  and classId != ''">and class_id = #{classId}</if>
+            <if test="className != null  and className != ''">and class_name like concat('%', #{className}, '%')</if>
+            <if test="discipline != null  and discipline != ''">and discipline = #{discipline}</if>
         </where>
     </select>
 
@@ -92,7 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteFormalTeacherClassById" parameterType="Long">
-        delete from formal_teacher_class where id = #{id}
+        delete
+        from formal_teacher_class
+        where id = #{id}
     </delete>
 
     <delete id="deleteFormalTeacherClassByIds" parameterType="String">
@@ -102,11 +118,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     <delete id="deleteFormalTeacherClassByTeacherId" parameterType="java.lang.Long">
-        delete from formal_teacher_class where teacher_id = #{userId}
+        delete
+        from formal_teacher_class
+        where teacher_id = #{userId}
     </delete>
 
     <select id="getTeacherClass" parameterType="string" resultMap="FormalTeacherClassResult">
         <include refid="selectFormalTeacherClassVo"/>
         where teacher_id = #{teacherId}
     </select>
+    <select id="queryMapperList" resultMap="FormalTeacherClassResult">
+        <include refid="selectFormalTeacherClassVo"/>
+        <where>
+            <if test="teacherId != null  and teacherId != ''">and teacher_id = #{teacherId}</if>
+            <if test="schoolId != null  and schoolId != ''">and school_id = #{schoolId}</if>
+            <if test="schoolName != null  and schoolName != ''">and school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="classId != null  and classId != ''">and class_id = #{classId}</if>
+            <if test="className != null  and className != ''">and class_name like concat('%', #{className}, '%')</if>
+            <if test="discipline != null  and discipline != ''">and discipline = #{discipline}</if>
+        </where>
+    </select>
 </mapper>

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

@@ -19,6 +19,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectRegisterParentsVo">
         select id,open_id, user_name, user_phone,is_pass, create_by, create_time, update_by, update_time, remark from register_parents
     </sql>
+    <update id="updateMapperById">
+        update register_parents
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openId != null  and openId != ''">  open_id = #{openId},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="userPhone != null">user_phone = #{userPhone},</if>
+            <if test="isPass != null">is_pass = #{isPass},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <delete id="deleteMapperBatchIds">
+        delete from register_parents where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
     <select id="selectRegisterParentsByOppenId" resultMap="RegisterParentsResult" parameterType="java.lang.String">
         <include refid="selectRegisterParentsVo"/>
@@ -29,4 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRegisterParentsVo"/>
         where  user_phone = #{phonenumber} limit 1
     </select>
+    <select id="selectMapperById" resultMap="RegisterParentsResult">
+        <include refid="selectRegisterParentsVo"/>
+        where  id = #{id}
+    </select>
 </mapper>

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

@@ -30,6 +30,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectRegisterParentsStudentVo">
         select id, parents_id,parents_name,parents_phone, school_id, school_name, class_id, class_name, student_name, student_number, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_parents_student
     </sql>
+    <update id="updateMapperById">
+        update register_parents_student
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentsId != null">parents_id = #{parentsId},</if>
+            <if test="parentsName != null "> parents_name = #{parentsName},</if>
+            <if test="parentsPhone != null "> parents_phone = #{parentsPhone},</if>
+            <if test="schoolId != null">school_id = #{schoolId},</if>
+            <if test="schoolName != null">school_name = #{schoolName},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="className != null">class_name = #{className},</if>
+            <if test="studentName != null">student_name = #{studentName},</if>
+            <if test="studentNumber != null">student_number = #{studentNumber},</if>
+            <if test="isPass != null">is_pass = #{isPass},</if>
+            <if test="auditId != null">audit_id= #{auditId},</if>
+            <if test="auditUser != null">audit_user= #{auditUser},</if>
+            <if test="opinion != null">opinion= #{opinion},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
 
     <delete id="deleteRegisterParentsStudentByParentsId" parameterType="java.lang.Long">
         delete from register_parents_student where parents_id = #{parentsId} and is_pass = '3';
@@ -47,4 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRegisterParentsStudentVo"/>
         ${ew.getCustomSqlSegment}
     </select>
+    <select id="selectVoMapperPage" resultMap="RegisterParentsStudentResult">
+        <include refid="selectRegisterParentsStudentVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
 </mapper>

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

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="org.dromara.system.mapper.RegisterSchoolMapper">
     <resultMap type="org.dromara.system.domain.vo.RegisterSchoolVo" id="RegisterSchoolResult">
         <result property="id"    column="id"    />
+        <result property="tenantId"    column="tenant_id"    />
         <result property="openId"    column="open_id"    />
         <result property="schoolName"    column="school_name"    />
         <result property="userName"    column="user_name"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRegisterSchoolVo">
-        select id,open_id, school_name, user_name, user_phone, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_school
+        select id,tenant_id,open_id, school_name, user_name, user_phone, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_school
     </sql>
 
     <select id="selectRegisterSchooByOppenId" resultMap="RegisterSchoolResult" parameterType="java.lang.String">
@@ -33,6 +34,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRegisterSchoolVo"/>
         where  user_phone = #{phonenumber} limit 1
     </select>
+    <select id="selectVoMapperById" resultMap="RegisterSchoolResult">
+        <include refid="selectRegisterSchoolVo"/>
+        where  id = #{id}
+    </select>
+    <select id="selectVoMapperPage" resultMap="RegisterSchoolResult">
+        <include refid="selectRegisterSchoolVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
 
     <delete id="deleteRegisterSchoolByOpenId">
         delete from register_school where open_id  = #{openId}

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

@@ -31,4 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <select id="selectVoMapperList" resultMap="RegisterTeacherClassResult">
+        <include refid="selectRegisterTeacherClassVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
 </mapper>

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

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="org.dromara.system.mapper.RegisterTeacherMapper">
     <resultMap type="org.dromara.system.domain.vo.RegisterTeacherVo" id="RegisterTeacherResult">
         <result property="id"    column="id"    />
+        <result property="tenantId"    column="tenant_id"    />
         <result property="openId"    column="open_id"    />
         <result property="schoolId"    column="school_id"    />
         <result property="schoolName"    column="school_name"    />
@@ -22,8 +23,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRegisterTeacherVo">
-        select id,open_id, school_id, school_name, user_name, user_phone, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_teacher
+        select id,tenant_id,open_id, school_id, school_name, user_name, user_phone, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_teacher
     </sql>
+    <update id="updateMapperById">
+        update register_teacher
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openId != null">open_id = #{openId},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="schoolId != null and schoolId != ''">school_id = #{schoolId},</if>
+            <if test="schoolName != null and schoolName != ''">school_name = #{schoolName},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="userPhone != null">user_phone = #{userPhone},</if>
+            <if test="isPass != null">is_pass = #{isPass},</if>
+            <if test="auditId != null">audit_id= #{auditId},</if>
+            <if test="auditUser != null">audit_user= #{auditUser},</if>
+            <if test="opinion != null">opinion= #{opinion},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
 
     <select id="selectRegisterTeacherByOppenId" resultMap="RegisterTeacherResult" parameterType="java.lang.String">
         <include refid="selectRegisterTeacherVo"/>
@@ -46,4 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and school_id = #{deptId}
     </select>
 
+    <select id="selectVoMapperPage" resultMap="RegisterTeacherResult">
+        <include refid="selectRegisterTeacherVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
+
 </mapper>

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

@@ -8,7 +8,7 @@
     </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
+        select d.dept_id, d.tenant_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>
 
@@ -82,6 +82,14 @@
         select * from sys_dept where del_flag = '0' and dept_id = #{deptId}
     </select>
 
+    <select id="selectDeptListMapperByIdList" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+        where d.del_flag = '0' and dept_id in
+        <foreach item="deptId" collection="array" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
+    </select>
+
     <insert id="insertDeptList">
         insert into sys_dept(parent_id,dept_name,ancestors,order_num,status,create_time) values
         <foreach item="item" index="index" collection="list" separator=",">

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

@@ -94,7 +94,6 @@
         from sys_menu m
                  left join sys_role_menu rm on m.menu_id = rm.menu_id
         where rm.role_id = #{roleId}
-          and m.perms is not null and m.perms != ''
     </select>
 
 </mapper>