移代码

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

@@ -27,6 +27,7 @@ import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.*;
 import org.dromara.system.domain.vo.*;
 import org.dromara.system.listener.SysUserImportListener;
+import org.dromara.system.mapper.FormalParentsStudentMapper;
 import org.dromara.system.mapper.FormalTeacherClassMapper;
 import org.dromara.system.service.*;
 import org.springframework.http.MediaType;
@@ -58,6 +59,8 @@ public class SysUserController extends BaseController {
 
     private final IFormalParentsStudentService formalParentsStudentService;
 
+    private final FormalParentsStudentMapper formalParentsStudentMapper;
+
     /**
      * 获取用户列表
      */
@@ -115,6 +118,8 @@ public class SysUserController extends BaseController {
             TenantHelper.clearDynamic();
         }
         SysUserVo user = userService.selectUserById(loginUser.getUserId());
+        //List<RoleDTO> roles = loginUser.getRoles();
+
         userInfoVo.setUser(user);
         userInfoVo.setPermissions(loginUser.getMenuPermission());
         userInfoVo.setRoles(loginUser.getRolePermission());
@@ -149,9 +154,7 @@ public class SysUserController extends BaseController {
 
     private void getParentsStudent(UserInfoVo user) {
 
-        FormalParentsStudentBo formalParentsStudent = new FormalParentsStudentBo();
-        formalParentsStudent.setParentsId(user.getUser().getUserId());
-        List<FormalParentsStudentVo> parentsStudent = formalParentsStudentService.queryList(formalParentsStudent);
+        List<FormalParentsStudentVo> parentsStudent = formalParentsStudentMapper.getStudentByParentId(String.valueOf(user.getUser().getUserId()));
         user.setParentsStudent(parentsStudent);
     }
 

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

@@ -57,7 +57,7 @@ public class ScoreDataStudentBo extends BaseEntity {
      * 总分
      */
     //@NotBlank(message = "总分不能为空", groups = { AddGroup.class, EditGroup.class })
-    private long zongfen;
+    private Long zongfen;
 
     /**
      * 平均分

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

@@ -2,6 +2,7 @@ package org.dromara.system.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
@@ -12,6 +13,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Set;
 
 /**
  * 角色信息视图对象 sys_role
@@ -93,6 +95,10 @@ public class SysRoleVo implements Serializable {
      */
     private boolean flag = false;
 
+    /** 角色菜单权限 */
+    @TableField(exist = false)
+    private Set<String> permissions;
+
     public boolean isSuperAdmin() {
         return UserConstants.SUPER_ADMIN_ID.equals(this.roleId);
     }

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

@@ -1,5 +1,6 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.dromara.system.domain.FormalParentsStudent;
 import org.dromara.system.domain.vo.FormalParentsStudentVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -62,4 +63,7 @@ public interface FormalParentsStudentMapper extends BaseMapperPlus<FormalParents
     public int deleteFormalParentsStudentByIds(Long[] ids);
 
     void deleteFormalParentsStudentByParentsId(Long userId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<FormalParentsStudentVo> getStudentByParentId(String valueOf);
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.dromara.system.domain.FormalTeacherClass;
 import org.dromara.system.domain.bo.FormalTeacherClassBo;
 import org.dromara.system.domain.vo.FormalTeacherClassVo;
@@ -62,6 +63,7 @@ public interface FormalTeacherClassMapper extends BaseMapperPlus<FormalTeacherCl
      */
     public int deleteFormalTeacherClassByIds(Long[] ids);
 
+    @InterceptorIgnore(tenantLine = "true")
     public List<FormalTeacherClassVo> getTeacherClass(String teacherId);
 
     void deleteFormalTeacherClassByTeacherId(Long userId);

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

@@ -1,5 +1,6 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.dromara.common.mybatis.annotation.DataColumn;
@@ -44,15 +45,21 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
      */
     List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
+    @InterceptorIgnore(tenantLine = "true")
     SysDeptVo selectDeptByParentId(long parentId);
 
+    @InterceptorIgnore(tenantLine = "true")
     void insertDeptList(List<SysDept> sysDeptList);
 
+    @InterceptorIgnore(tenantLine = "true")
     void updateDeptIsStatus(Long parentId);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<SysDeptVo> selectDeptListChildren(Long parentId);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<SysDeptVo> selectDeptOldList(SysDeptBo dept);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<SysDeptVo> selectDeptListMapper(SysDeptBo dept);
 }

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

@@ -1,6 +1,8 @@
 package org.dromara.system.service.impl;
 
+import lombok.SneakyThrows;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.ClassUtils;
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.system.domain.bo.RegisterParentsStudentBo;
+import org.dromara.system.domain.bo.RegisterTeacherClassBo;
 import org.dromara.system.domain.vo.RegisterParentsStudentVo;
 import org.dromara.system.mapper.RegisterParentsStudentMapper;
 import org.dromara.system.service.IRegisterParentsStudentService;
@@ -20,6 +23,7 @@ import org.dromara.system.domain.vo.RegisterParentsVo;
 import org.dromara.system.domain.RegisterParents;
 import org.dromara.system.mapper.RegisterParentsMapper;
 import org.dromara.system.service.IRegisterParentsService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -81,7 +85,9 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
     /**
      * 新增注册-家长
      */
+    @SneakyThrows
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R<RegisterParentsVo> insertByBo(RegisterParentsBo bo) {
 
         //查询是否已经注册过
@@ -97,6 +103,10 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
         }
         bo.setCreateTime(DateUtils.getNowDate());
         bo.setUpdateTime(DateUtils.getNowDate());
+        RegisterParents add = MapstructUtils.convert(bo, RegisterParents.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        bo.setId(add.getId());
 
         List<RegisterParentsStudentVo> registerParentsStudentList = bo.getRegisterParentsStudentList();
         if(registerParentsStudentList!=null && registerParentsStudentList.size()>0){
@@ -107,17 +117,15 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
                 registerParentsStudent.setCreateTime(DateUtils.getNowDate());
                 registerParentsStudent.setUpdateTime(DateUtils.getNowDate());
 
-                RegisterParentsStudentBo registerParentsStudentBo = MapstructUtils.convert(registerParentsStudent, RegisterParentsStudentBo.class);
+                RegisterParentsStudentBo registerParentsStudentBo = new RegisterParentsStudentBo();
+                ClassUtils.copyProperties(registerParentsStudent, registerParentsStudentBo);
                 registerParentsStudentService.insertByBo(registerParentsStudentBo);
             }
         }
 
-        RegisterParents add = MapstructUtils.convert(bo, RegisterParents.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
-            R.ok();
+            return R.ok();
         }
         return R.fail();
     }

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

@@ -128,7 +128,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
         RegisterTeacher add = MapstructUtils.convert(bo, RegisterTeacher.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
-
+        bo.setId(add.getId());
         if (bo.getRegisterTeacherClassList() != null && bo.getRegisterTeacherClassList().size() > 0) {
 
             List<RegisterTeacherClassVo> registerTeacherClassList = bo.getRegisterTeacherClassList();

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

@@ -3,6 +3,7 @@ package org.dromara.system.service.impl;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.RandomUtil;
+import org.dromara.common.core.constant.TenantConstants;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.DateUtils;
@@ -66,6 +67,9 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
 
     private final SysUserMapper userMapper;
     private final SysUserServiceImpl sysUserServiceImpl;
+    private final SysDictTypeMapper dictTypeMapper;
+    private final SysDictDataMapper dictDataMapper;
+    private final SysConfigMapper configMapper;
 
     /**
      * 查询智慧校园_审核意见
@@ -139,7 +143,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 registerSchoolMapper.updateById(schoolu);
                 //生成租户信息
                 SysTenantBo tenantBo = new SysTenantBo();
-                tenantBo.setCompanyName(loginUser.getNickname());
+                tenantBo.setCompanyName(registerSchool.getUserName());
                 tenantBo.setContactUserName(registerSchool.getUserName());
                 tenantBo.setContactPhone(registerSchool.getUserPhone());
                 tenantBo.setUsername(registerSchool.getUserPhone());
@@ -157,6 +161,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 }
                 tenantBo.setId(sysTenant.getId());
 
+                copyDict(tenantId);
                 //部门表生成学校
                 SysDept dept = new SysDept();
                 dept.setParentId(0L);
@@ -378,6 +383,37 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
         return flag;
     }
 
+    /***
+     *复制公用字典值
+     * @param tenantId
+     */
+    private void copyDict(String tenantId){
+
+        String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
+        List<SysDictType> dictTypeList = dictTypeMapper.selectList(
+            new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getTenantId, defaultTenantId));
+        List<SysDictData> dictDataList = dictDataMapper.selectList(
+            new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getTenantId, defaultTenantId));
+        for (SysDictType dictType : dictTypeList) {
+            dictType.setDictId(null);
+            dictType.setTenantId(tenantId);
+        }
+        for (SysDictData dictData : dictDataList) {
+            dictData.setDictCode(null);
+            dictData.setTenantId(tenantId);
+        }
+        dictTypeMapper.insertBatch(dictTypeList);
+        dictDataMapper.insertBatch(dictDataList);
+
+        List<SysConfig> sysConfigList = configMapper.selectList(
+            new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getTenantId, defaultTenantId));
+        for (SysConfig config : sysConfigList) {
+            config.setConfigId(null);
+            config.setTenantId(tenantId);
+        }
+        configMapper.insertBatch(sysConfigList);
+    }
+
     /**
      * 修改智慧校园_审核意见
      */

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

@@ -37,6 +37,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="getStudentByParentId" resultMap="FormalParentsStudentResult">
+        <include refid="selectFormalParentsStudentVo"/>
+        where parents_id =  #{parentsId}
+    </select>
+
     <insert id="insertFormalParentsStudent" parameterType="FormalParentsStudent" useGeneratedKeys="true" keyProperty="id">
         insert into formal_parents_student
         <trim prefix="(" suffix=")" suffixOverrides=",">