tianzeOrg
/
TextBigData
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Browse Source
master
yz 2 years ago
parent 8848866817
commit f9081f54e5
8 changed files with 161 additions and 80 deletions
Show Stats Download Patch File Download Diff File

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.mapper.SysRoleDeptMapper;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -49,6 +51,9 @@ public class SysUserController extends BaseController
@Autowired @Autowired
private ISysPostService postService; private ISysPostService postService;
@Autowired
SysRoleDeptMapper roleDeptMapper;
/** /**
* 获取用户列表 * 获取用户列表
*/ */
@ -160,6 +165,9 @@ public class SysUserController extends BaseController
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
} }
user.setUpdateBy(getUsername()); user.setUpdateBy(getUsername());
String stuClass = roleDeptMapper.selectNameById(user.getDeptId());
user.setStuClass(stuClass);
return toAjax(userService.updateUser(user)); return toAjax(userService.updateUser(user));
} }

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
Unescape Escape View File

@ -65,7 +65,7 @@ public class SysUser extends BaseEntity {
/** /**
* 班级 * 班级
*/ */
@Excel(name = "学生班级") @Excel(name = "所属班级")
private String stuClass; private String stuClass;
/** /**
@ -103,7 +103,7 @@ public class SysUser extends BaseEntity {
/** /**
* 帐号状态（0正常 1停用） * 帐号状态（0正常 1停用）
*/ */
@Excel(name = "帐号状态（0=正常,1=停用）", readConverterExp = "0=正常,1=停用") // @Excel(name = "帐号状态（0=正常,1=停用）", readConverterExp = "0=正常,1=停用")
private String status; private String status;
/** /**

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.system.domain.SysRoleDept; import com.ruoyi.system.domain.SysRoleDept;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@ -10,6 +11,7 @@ import org.apache.ibatis.annotations.Select;
* *
* @author ruoyi * @author ruoyi
*/ */
@Mapper
public interface SysRoleDeptMapper public interface SysRoleDeptMapper
{ {
/** /**

5
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysTrainingScoreMapper.java
Unescape Escape View File

@ -121,4 +121,9 @@ public interface SysTrainingScoreMapper {
int updateByPrimaryKey(SysTrainingScore record); int updateByPrimaryKey(SysTrainingScore record);
List<SysTrainingScore> selectAllReportContent(); List<SysTrainingScore> selectAllReportContent();
void deleteByUserId(Long userId);
void deleteByUserIds(Long[] userIds);
} }

205
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
Unescape Escape View File

@ -32,11 +32,12 @@ import com.ruoyi.system.service.ISysUserService;
/** /**
* 用户 业务层处理 * 用户 业务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysUserServiceImpl implements ISysUserService { public class SysUserServiceImpl implements ISysUserService
{
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
@Autowired @Autowired
@ -109,31 +110,35 @@ public class SysUserServiceImpl implements ISysUserService {
* @return 用户对象信息 * @return 用户对象信息
*/ */
@Override @Override
public SysUser selectUserByUserName(String userName) { public SysUser selectUserByUserName(String userName)
{
return userMapper.selectUserByUserName(userName); return userMapper.selectUserByUserName(userName);
} }
/** /**
* 通过用户ID查询用户 * 通过用户ID查询用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 用户对象信息 * @return 用户对象信息
*/ */
@Override @Override
public SysUser selectUserById(Long userId) { public SysUser selectUserById(Long userId)
{
return userMapper.selectUserById(userId); return userMapper.selectUserById(userId);
} }
/** /**
* 查询用户所属角色组 * 查询用户所属角色组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@Override @Override
public String selectUserRoleGroup(String userName) { public String selectUserRoleGroup(String userName)
{
List<SysRole> list = roleMapper.selectRolesByUserName(userName); List<SysRole> list = roleMapper.selectRolesByUserName(userName);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list))
{
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
@ -141,14 +146,16 @@ public class SysUserServiceImpl implements ISysUserService {
/** /**
* 查询用户所属岗位组 * 查询用户所属岗位组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@Override @Override
public String selectUserPostGroup(String userName) { public String selectUserPostGroup(String userName)
{
List<SysPost> list = postMapper.selectPostsByUserName(userName); List<SysPost> list = postMapper.selectPostsByUserName(userName);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list))
{
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
@ -156,14 +163,16 @@ public class SysUserServiceImpl implements ISysUserService {
/** /**
* 校验用户名称是否唯一 * 校验用户名称是否唯一
* *
* @param userName 用户名称 * @param userName 用户名称
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkUserNameUnique(String userName) { public String checkUserNameUnique(String userName)
{
int count = userMapper.checkUserNameUnique(userName); int count = userMapper.checkUserNameUnique(userName);
if (count > 0) { if (count > 0)
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -176,10 +185,12 @@ public class SysUserServiceImpl implements ISysUserService {
* @return * @return
*/ */
@Override @Override
public String checkPhoneUnique(SysUser user) { public String checkPhoneUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -192,10 +203,12 @@ public class SysUserServiceImpl implements ISysUserService {
* @return * @return
*/ */
@Override @Override
public String checkEmailUnique(SysUser user) { public String checkEmailUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail()); SysUser info = userMapper.checkEmailUnique(user.getEmail());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -203,28 +216,33 @@ public class SysUserServiceImpl implements ISysUserService {
/** /**
* 校验用户是否允许操作 * 校验用户是否允许操作
* *
* @param user 用户信息 * @param user 用户信息
*/ */
@Override @Override
public void checkUserAllowed(SysUser user) { public void checkUserAllowed(SysUser user)
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) { {
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
{
throw new ServiceException("不允许操作超级管理员用户"); throw new ServiceException("不允许操作超级管理员用户");
} }
} }
/** /**
* 校验用户是否有数据权限 * 校验用户是否有数据权限
* *
* @param userId 用户id * @param userId 用户id
*/ */
@Override @Override
public void checkUserDataScope(Long userId) { public void checkUserDataScope(Long userId)
if (!SysUser.isAdmin(SecurityUtils.getUserId())) { {
if (!SysUser.isAdmin(SecurityUtils.getUserId()))
{
SysUser user = new SysUser(); SysUser user = new SysUser();
user.setUserId(userId); user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user); List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
if (StringUtils.isEmpty(users)) { if (StringUtils.isEmpty(users))
{
throw new ServiceException("没有权限访问用户数据！"); throw new ServiceException("没有权限访问用户数据！");
} }
} }
@ -232,7 +250,7 @@ public class SysUserServiceImpl implements ISysUserService {
/** /**
* 新增保存用户信息 * 新增保存用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -240,9 +258,9 @@ public class SysUserServiceImpl implements ISysUserService {
@Transactional @Transactional
public int insertUser(SysUser user) { public int insertUser(SysUser user) {
// 新增用户信息 // 新增用户信息
int rows = userMapper.insertUser(user);
String deptName = roleDeptMapper.selectNameById(user.getDeptId()); String deptName = roleDeptMapper.selectNameById(user.getDeptId());
user.setStuClass(deptName); user.setStuClass(deptName);
int rows = userMapper.insertUser(user);
// 新增用户岗位关联 // 新增用户岗位关联
insertUserPost(user); insertUserPost(user);
// 新增用户与角色管理 // 新增用户与角色管理
@ -250,7 +268,7 @@ public class SysUserServiceImpl implements ISysUserService {
//新增实训成绩 //新增实训成绩
Long userId = userMapper.selectUserIDByStuNum(user.getStudentNumber()); Long userId = userMapper.selectUserIDByStuNum(user.getStudentNumber());
SysTrainingScore sysTrainingScore = new SysTrainingScore(); SysTrainingScore sysTrainingScore = new SysTrainingScore();
sysTrainingScore.setUserid(user.getUserId()); sysTrainingScore.setUserid(userId);
sysTrainingScore.setStatus(0); sysTrainingScore.setStatus(0);
sysTrainingScore.setId(String.valueOf(UUID.randomUUID())); sysTrainingScore.setId(String.valueOf(UUID.randomUUID()));
trainingScoreMapper.insert(sysTrainingScore); trainingScoreMapper.insert(sysTrainingScore);
@ -259,24 +277,26 @@ public class SysUserServiceImpl implements ISysUserService {
/** /**
* 注册用户信息 * 注册用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean registerUser(SysUser user) { public boolean registerUser(SysUser user)
{
return userMapper.insertUser(user) > 0; return userMapper.insertUser(user) > 0;
} }
/** /**
* 修改保存用户信息 * 修改保存用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int updateUser(SysUser user) { public int updateUser(SysUser user)
{
Long userId = user.getUserId(); Long userId = user.getUserId();
// 删除用户与角色关联 // 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId); userRoleMapper.deleteUserRoleByUserId(userId);
@ -291,94 +311,104 @@ public class SysUserServiceImpl implements ISysUserService {
/** /**
* 用户授权角色 * 用户授权角色
* *
* @param userId 用户ID * @param userId 用户ID
* @param roleIds 角色组 * @param roleIds 角色组
*/ */
@Override @Override
@Transactional @Transactional
public void insertUserAuth(Long userId, Long[] roleIds) { public void insertUserAuth(Long userId, Long[] roleIds)
{
userRoleMapper.deleteUserRoleByUserId(userId); userRoleMapper.deleteUserRoleByUserId(userId);
insertUserRole(userId, roleIds); insertUserRole(userId, roleIds);
} }
/** /**
* 修改用户状态 * 修改用户状态
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateUserStatus(SysUser user) { public int updateUserStatus(SysUser user)
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
/** /**
* 修改用户基本信息 * 修改用户基本信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateUserProfile(SysUser user) { public int updateUserProfile(SysUser user)
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
/** /**
* 修改用户头像 * 修改用户头像
* *
* @param userName 用户名 * @param userName 用户名
* @param avatar 头像地址 * @param avatar 头像地址
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean updateUserAvatar(String userName, String avatar) { public boolean updateUserAvatar(String userName, String avatar)
{
return userMapper.updateUserAvatar(userName, avatar) > 0; return userMapper.updateUserAvatar(userName, avatar) > 0;
} }
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int resetPwd(SysUser user) { public int resetPwd(SysUser user)
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param userName 用户名 * @param userName 用户名
* @param password 密码 * @param password 密码
* @return 结果 * @return 结果
*/ */
@Override @Override
public int resetUserPwd(String userName, String password) { public int resetUserPwd(String userName, String password)
{
return userMapper.resetUserPwd(userName, password); return userMapper.resetUserPwd(userName, password);
} }
/** /**
* 新增用户角色信息 * 新增用户角色信息
* *
* @param user 用户对象 * @param user 用户对象
*/ */
public void insertUserRole(SysUser user) { public void insertUserRole(SysUser user)
{
this.insertUserRole(user.getUserId(), user.getRoleIds()); this.insertUserRole(user.getUserId(), user.getRoleIds());
} }
/** /**
* 新增用户岗位信息 * 新增用户岗位信息
* *
* @param user 用户对象 * @param user 用户对象
*/ */
public void insertUserPost(SysUser user) { public void insertUserPost(SysUser user)
{
Long[] posts = user.getPostIds(); Long[] posts = user.getPostIds();
if (StringUtils.isNotEmpty(posts)) { if (StringUtils.isNotEmpty(posts))
{
// 新增用户与岗位管理 // 新增用户与岗位管理
List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length); List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
for (Long postId : posts) { for (Long postId : posts)
{
SysUserPost up = new SysUserPost(); SysUserPost up = new SysUserPost();
up.setUserId(user.getUserId()); up.setUserId(user.getUserId());
up.setPostId(postId); up.setPostId(postId);
@ -390,15 +420,18 @@ public class SysUserServiceImpl implements ISysUserService {
/** /**
* 新增用户角色信息 * 新增用户角色信息
* *
* @param userId 用户ID * @param userId 用户ID
* @param roleIds 角色组 * @param roleIds 角色组
*/ */
public void insertUserRole(Long userId, Long[] roleIds) { public void insertUserRole(Long userId, Long[] roleIds)
if (StringUtils.isNotEmpty(roleIds)) { {
if (StringUtils.isNotEmpty(roleIds))
{
// 新增用户与角色管理 // 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length); List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
for (Long roleId : roleIds) { for (Long roleId : roleIds)
{
SysUserRole ur = new SysUserRole(); SysUserRole ur = new SysUserRole();
ur.setUserId(userId); ur.setUserId(userId);
ur.setRoleId(roleId); ur.setRoleId(roleId);
@ -410,30 +443,34 @@ public class SysUserServiceImpl implements ISysUserService {
/** /**
* 通过用户ID删除用户 * 通过用户ID删除用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int deleteUserById(Long userId) { public int deleteUserById(Long userId)
{
// 删除用户与角色关联 // 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId); userRoleMapper.deleteUserRoleByUserId(userId);
// 删除用户与岗位表 // 删除用户与岗位表
userPostMapper.deleteUserPostByUserId(userId); userPostMapper.deleteUserPostByUserId(userId);
trainingScoreMapper.deleteByUserId(userId);
return userMapper.deleteUserById(userId); return userMapper.deleteUserById(userId);
} }
/** /**
* 批量删除用户信息 * 批量删除用户信息
* *
* @param userIds 需要删除的用户ID * @param userIds 需要删除的用户ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int deleteUserByIds(Long[] userIds) { public int deleteUserByIds(Long[] userIds)
for (Long userId : userIds) { {
for (Long userId : userIds)
{
checkUserAllowed(new SysUser(userId)); checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId); checkUserDataScope(userId);
} }
@ -441,20 +478,26 @@ public class SysUserServiceImpl implements ISysUserService {
userRoleMapper.deleteUserRole(userIds); userRoleMapper.deleteUserRole(userIds);
// 删除用户与岗位关联 // 删除用户与岗位关联
userPostMapper.deleteUserPost(userIds); userPostMapper.deleteUserPost(userIds);
//删除用户实训记录
for (int i = 0; i < userIds.length; i++) {
trainingScoreMapper.deleteByUserId(userIds[i]);
}
return userMapper.deleteUserByIds(userIds); return userMapper.deleteUserByIds(userIds);
} }
/** /**
* 导入用户数据 * 导入用户数据
* *
* @param userList 用户数据列表 * @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
* @param operName 操作用户 * @param operName 操作用户
* @return 结果 * @return 结果
*/ */
@Override @Override
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) { public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
if (StringUtils.isNull(userList) || userList.size() == 0) { {
if (StringUtils.isNull(userList) || userList.size() == 0)
{
throw new ServiceException("导入用户数据不能为空！"); throw new ServiceException("导入用户数据不能为空！");
} }
int successNum = 0; int successNum = 0;
@ -462,38 +505,50 @@ public class SysUserServiceImpl implements ISysUserService {
StringBuilder successMsg = new StringBuilder(); StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword"); String password = configService.selectConfigByKey("sys.user.initPassword");
for (SysUser user : userList) { for (SysUser user : userList)
try { {
try
{
// 验证是否存在这个用户 // 验证是否存在这个用户
SysUser u = userMapper.selectUserByUserName(user.getUserName()); SysUser u = userMapper.selectUserByUserName(user.getUserName());
if (StringUtils.isNull(u)) { if (StringUtils.isNull(u))
{
BeanValidators.validateWithException(validator, user); BeanValidators.validateWithException(validator, user);
user.setPassword(SecurityUtils.encryptPassword(password)); user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName); user.setCreateBy(operName);
this.insertUser(user); this.insertUser(user);
successNum++; successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功"); successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
} else if (isUpdateSupport) { }
else if (isUpdateSupport)
{
BeanValidators.validateWithException(validator, user); BeanValidators.validateWithException(validator, user);
user.setUpdateBy(operName); user.setUpdateBy(operName);
this.updateUser(user); this.updateUser(user);
successNum++; successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功"); successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
} else { }
else
{
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在"); failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
} }
} catch (Exception e) { }
catch (Exception e)
{
failureNum++; failureNum++;
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
failureMsg.append(msg + e.getMessage()); failureMsg.append(msg + e.getMessage());
log.error(msg, e); log.error(msg, e);
} }
} }
if (failureNum > 0) { if (failureNum > 0)
{
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
throw new ServiceException(failureMsg.toString()); throw new ServiceException(failureMsg.toString());
} else { }
else
{
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
} }
return successMsg.toString(); return successMsg.toString();

2
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
Unescape Escape View File

@ -55,7 +55,7 @@
</select> </select>
<select id="selectTeacherMenuTreeAll" resultMap="SysMenuResult"> <select id="selectTeacherMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu_stu m where m.menu_type in ('M', 'C') and m.status = 0 and menu_id not in(2000,2004,2008,2009) from sys_menu_stu m where m.menu_type in ('M', 'C') and m.status = 0 and menu_id not in(2000,2004,2008,2009,2007)
order by m.parent_id, m.order_num order by m.parent_id, m.order_num
</select> </select>

11
ruoyi-system/src/main/resources/mapper/system/SysTrainingScoreMapper.xml
Unescape Escape View File

@ -1615,4 +1615,15 @@
<select id="selectAllReportContent" resultMap="ResultMapWithBLOBs"> <select id="selectAllReportContent" resultMap="ResultMapWithBLOBs">
select id,userid,report_content from sys_training_score WHERE report_content IS NOT NULL select id,userid,report_content from sys_training_score WHERE report_content IS NOT NULL
</select> </select>
<delete id="deleteByUserId" parameterType="Long">
delete from sys_training_score where userid=#{userId}
</delete>
<delete id="deleteByUserIds" parameterType="Long">
delete from sys_training_score where userid in
<foreach collection="array" item="userid" open="(" separator="," close=")">
#{userId}
</foreach>
</delete>
</mapper> </mapper>

4
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
Unescape Escape View File

@ -259,8 +259,8 @@
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if> <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="email != null ">email = #{email},</if> <if test="email != null ">email = #{email},</if>
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if> <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
<if test="studentNumber != null and studentNumber != ''">#{studentNumber},</if> <if test="studentNumber != null and studentNumber != ''">studentnumber = #{studentNumber},</if>
<if test="stuClass != null and stuClass != ''">#{stuClass},</if> <if test="stuClass != null and stuClass != ''">stuClass = #{stuClass},</if>
<if test="sex != null and sex != ''">sex = #{sex},</if> <if test="sex != null and sex != ''">sex = #{sex},</if>
<if test="avatar != null and avatar != ''">avatar = #{avatar},</if> <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
<if test="password != null and password != ''">password = #{password},</if> <if test="password != null and password != ''">password = #{password},</if>

Write Preview
Loading…
Cancel
Save