From dec2234ff37237d6ffd7bb936c9756cff8a8e674 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 15 十一月 2025 17:42:57 +0800
Subject: [PATCH] 修改异常
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 1 +
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/vo/RoleInfoVO.java | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseOrderController.java | 1 +
6 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index bc31b5b..1d1bcf3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -37,7 +37,7 @@
@ApiOperation(value = "修改状态")
@GetMapping(value = "/changeStatus")
@Log(title = "小程序用户-修改状态", businessType = BusinessType.UPDATE)
- public R pageList(Integer id) {
+ public R pageList(@RequestParam String id) {
TAppUser appUser = appUserService.getById(id);
appUser.setStatus(appUser.getStatus()==1?2:1);
appUserService.updateById(appUser);
@@ -45,7 +45,7 @@
}
@ApiOperation(value = "查看详情")
@GetMapping(value = "/detail")
- public R<TAppUser> detail(Integer id) {
+ public R<TAppUser> detail(@RequestParam String id) {
return R.ok(appUserService.getById( id));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseOrderController.java
index 54c9b73..5923838 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseOrderController.java
@@ -126,6 +126,7 @@
if(dto.getRefundStatus() == 3){
// 驳回
courseOrder.setRejectReason(dto.getRejectReason());
+ courseOrder.setPayStatus(2);
}
courseOrderService.updateById(courseOrder);
return R.ok();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java
index e682dd5..e6e2c36 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java
@@ -65,7 +65,7 @@
sysConfig.setContent(htmlConfigList.get(0).getContent());
}
}
- htmlConfigService.updateBatchById(htmlConfigs);
+ htmlConfigService.updateBatchById(sysConfigs);
return R.ok();
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 7eb2a7d..3d41bfb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -127,6 +127,7 @@
RoleInfoVO roleInfoVo = new RoleInfoVO();
roleInfoVo.setRoleId(role.getRoleId());
roleInfoVo.setRoleName(role.getRoleName());
+ roleInfoVo.setRemark(role.getRemark());
// 获取当前角色的菜单列表
List<SysMenu> menus = menuService.selectListByRoleId(roleId);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/RoleInfoVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/RoleInfoVO.java
index 091bba6..4555a45 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/RoleInfoVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/RoleInfoVO.java
@@ -10,6 +10,7 @@
private Long roleId;
private String roleName;
+ private String remark;
@ApiModelProperty("菜单id")
private List<Long> menus;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e423805..6d9ccd6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -131,7 +131,7 @@
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,
- ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName
+ ur.role_id AS roleId,sr.role_name AS roleName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role sr on ur.role_id = sr.role_id
@@ -223,7 +223,7 @@
<select id="pageList" resultType="com.ruoyi.system.vo.SysUserVO">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email,
u.avatar AS avatar,u.disable_remark AS disableRemark,u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status,
- u.del_flag AS delFlag, u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,
+ u.del_flag AS delFlag, u.login_ip AS loginIp,
u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,r.role_id AS roleId, r.role_name AS roleName,
r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status
from sys_user u
--
Gitblit v1.7.1