From 31afc8ef795e1abe0c66cade76b0dc49692b1d1d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 22 十月 2026 15:20:33 +0800
Subject: [PATCH] 用户管理增加机构id,机构名称字段
---
ruoyi-admin/target/classes/com/ruoyi/web/controller/project/ServiceTotalsController.class | 0
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 6 ++++++
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 1 +
ruoyi-admin/src/main/resources/application.yml | 2 +-
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 3bc90f9..c1ad2e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -145,6 +145,7 @@
* 淇敼鐢ㄦ埛
*/
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @ApiOperation("鐢ㄦ埛绠＄悊淇敼")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysUser user) {
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index af95dec..b766dd5 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -44,7 +44,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: prod
+ active: druid
# active: druid
# 鏂囦欢涓婁紶
servlet:
diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/project/ServiceTotalsController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/project/ServiceTotalsController.class
index 1fc4ca2..d9d1723 100644
--- a/ruoyi-admin/target/classes/com/ruoyi/web/controller/project/ServiceTotalsController.class
+++ b/ruoyi-admin/target/classes/com/ruoyi/web/controller/project/ServiceTotalsController.class
Binary files differ
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index c7512cd..8b9a213 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -114,8 +114,8 @@
.antMatchers("/swagger-ui.html").permitAll()
.antMatchers("/swagger-resources/**").permitAll()
.antMatchers("/webjars/**").permitAll()
-// .antMatchers("/*/api-docs").permitAll()
-// .antMatchers("/druid/**").anonymous()
+ .antMatchers("/*/api-docs").permitAll()
+ .antMatchers("/druid/**").anonymous()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
.anyRequest().authenticated()
.and()
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e675831..8f3ebdd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -225,6 +225,8 @@
<if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
+ <if test="orgId != null and orgId != ''">org_id,</if>
+ <if test="orgName != null and orgName != ''">org_name,</if>
<if test="dingUserId != null and dingUserId != ''">ding_user_id,</if>
create_time
)values(
@@ -240,6 +242,8 @@
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
+ <if test="orgId != null and orgId != ''">#{org_id},</if>
+ <if test="orgName != null and orgName != ''">#{org_name},</if>
<if test="dingUserId != null and dingUserId != ''">#{dingUserId},</if>
sysdate()
)
@@ -263,6 +267,8 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="errorNums != null">error_nums = #{errorNums},</if>
+ <if test="orgId != null">org_id = #{orgId},</if>
+ <if test="orgName != null">org_name = #{orgName},</if>
<if test="dingUserId != null and dingUserId != ''">ding_user_id = #{dingUserId},</if>
update_time = sysdate()
</set>
--
Gitblit v1.9.3