From a5e4eebc714d0c37c942c20d127a3e38a334fa6b Mon Sep 17 00:00:00 2001
From: wsm <8454518+new-twice@user.noreply.gitee.com>
Date: Fri, 14 Aug 2026 07:15:16 +0000
Subject: [PATCH] =?UTF-8?q?!129=20feat(sysuser):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8C=89=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=B9=B6=E4=BD=BF=E7=94=A8=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=89=88JOIN=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(sysuser): 新增按角色查询用户接口并使用优化版JOIN查询
* fix(bgpartymatter): 移除后端自动生成业务序号逻辑
---
 .../controller/BgPartymatterController.java   | 16 ------------
 .../system/controller/SysUserController.java  | 25 +++++++++++++++++++
 .../modules/system/mapper/SysUserMapper.java  |  9 +++++++
 .../system/mapper/xml/SysUserMapper.xml       | 10 ++++++++
 .../system/service/ISysUserService.java       |  9 +++++++
 .../service/impl/SysUserServiceImpl.java      | 24 ++++++++++++++++++
 6 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java
index c24e475..6ef40bc 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java
@@ -49,7 +49,6 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -155,7 +154,6 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
             bgPartymatter.setBpmStatus("1");
         }
         fillDefaultMeetingTypeForCreate(bgPartymatter);
-        fillGeneratedNumber(bgPartymatter);
         bgPartymatterService.save(bgPartymatter);
         return Result.OK("添加成功！");
     }
@@ -172,7 +170,6 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody BgPartymatter bgPartymatter) {
         fillMeetingTypeForUpdate(bgPartymatter);
-        fillGeneratedNumber(bgPartymatter);
         bgPartymatterService.updateById(bgPartymatter);
         return Result.OK("编辑成功!");
     }
@@ -195,7 +192,6 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
         }
         String varField = oConvertUtils.isEmpty(dto.getVarField()) ? "json_data" : dto.getVarField();
         fillMeetingTypeForUpdate(dto.getFormData());
-        fillGeneratedNumber(dto.getFormData());
         bgPartymatterService.saveBpmFormAndSyncVariable(dto.getFormData(), dto.getProcessInstanceId(), varField,
                 JSONObject.toJSONString(dto.getFormData()));
         return Result.OK("保存成功");
@@ -227,18 +223,6 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
         bgPartymatter.setMeetingType(BgPartymatterConstant.MeetingType.PARTY);
     }
 
-    /**
-     * 根据会议时间和议题序号生成业务序号，规则：yyyyMMdd-议题序号。
-     * 前端会即时回显，后端保存前再次生成，保证接口调用和流程保存数据一致。
-     */
-    private void fillGeneratedNumber(BgPartymatter bgPartymatter) {
-        if (bgPartymatter == null || bgPartymatter.getMatterTime() == null || bgPartymatter.getItemNumber() == null) {
-            return;
-        }
-        String dateText = new SimpleDateFormat("yyyyMMdd").format(bgPartymatter.getMatterTime());
-        bgPartymatter.setNumber(dateText + "-" + bgPartymatter.getItemNumber());
-    }
-
     /**
      * 通过id删除
      *
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 62eb120..442147a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -538,6 +538,31 @@ public class SysUserController {
         return Result.OK(pageList);
     }
 
+    /**
+     * 用户选择组件 专用  根据角色ID查询用户列表
+     * @param pageNo
+     * @param pageSize
+     * @param roleId
+     * @return
+     */
+    @RequestMapping(value = "/queryUserByRoleId", method = RequestMethod.GET)
+    @Operation(summary = "根据角色ID查询用户列表", description = "根据输入的roleId返回该角色下的所有用户（分页）")
+    public Result<IPage<SysUser>> queryUserByRoleId(
+            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+            @RequestParam(name = "departId", required = false) String departId,
+            @RequestParam(name = "roleId", required = false) String roleId,
+            @RequestParam(name="realname",required=false) String realname,
+            @RequestParam(name="username",required=false) String username,
+            @RequestParam(name="isMultiTranslate",required=false) String isMultiTranslate,
+            @RequestParam(name="id",required = false) String id,
+            @RequestParam(name="searchSecurityLevel",required = false) Integer searchSecurityLevel
+    ) {
+        Page<SysUser> page = new Page<>(pageNo, pageSize);
+        IPage<SysUser> pageList = sysUserService.getUserByRoleIdOptimized(page, roleId, username);
+        return Result.OK(pageList);
+    }
+
     /**
      * 用户选择组件 专用  根据用户账号或部门，角色分页查询
      * @param deptRoleVO
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
index dfe3411..b3bdbb1 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
@@ -81,6 +81,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 */
 	IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username);
 
+	/**
+	 * 根据角色Id查询用户信息（优化版：INNER JOIN + DISTINCT，供专用接口使用）
+	 * @param page
+	 * @param roleId 角色id
+	 * @param username 用户登录账户
+	 * @return
+	 */
+	IPage<SysUser> getUserByRoleIdOptimized(Page page, @Param("roleId") String roleId, @Param("username") String username);
+
 	/**
 	 * 根据角色Id查询带部门的用户信息
 	 * @param page
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
index 248441f..ab29d7a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -59,6 +59,16 @@
 		</if>
 	</select>
 
+	<!-- 根据角色Id查询（优化版：INNER JOIN + DISTINCT，供专用接口使用） -->
+	<select id="getUserByRoleIdOptimized" resultType="org.jeecg.modules.system.entity.SysUser">
+		select distinct u.* from sys_user u
+		inner join sys_user_role ur on ur.user_id = u.id
+		where u.del_flag = 0 and ur.role_id = #{roleId}
+		<if test="username!=null and username!=''">
+			and u.username = #{username}
+		</if>
+	</select>
+
 	<!-- Multi-instance flow task query. Keep it separate from the overloaded getUserByRoleId statement. -->
 	<select id="getUsernamesByRoleId" resultType="java.lang.String">
 		select distinct u.username
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 99c06f9..387857b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -184,6 +184,15 @@ public interface ISysUserService extends IService<SysUser> {
 	 */
 	public IPage<SysUser> getUserByRoleId(Page<SysUser> page,String roleId, String username);
 
+	/**
+	 * 根据角色Id查询（优化版：INNER JOIN + DISTINCT，供专用接口使用）
+	 * @param page
+	 * @param roleId 角色id
+	 * @param username 用户账户名称
+	 * @return
+	 */
+	public IPage<SysUser> getUserByRoleIdOptimized(Page<SysUser> page,String roleId, String username);
+
 	/**
 	 * 根据角色Id查询
 	 * @param page
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 56a329c..608811a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -584,6 +584,30 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		//update-end---author:wangshuai ---date:20230220  for：[QQYUN-3980]组织管理中 职位功能 职位表加租户id 加职位-用户关联表------------
 	}
 
+	/**
+	 * 根据角色Id查询（优化版：INNER JOIN + DISTINCT，供专用接口使用）
+	 * @param page
+	 * @param roleId 角色id
+	 * @param username 用户账户名称
+	 * @return
+	 */
+	@Override
+	public IPage<SysUser> getUserByRoleIdOptimized(Page<SysUser> page, String roleId, String username) {
+		IPage<SysUser> userRoleList = userMapper.getUserByRoleIdOptimized(page, roleId, username);
+		List<SysUser> records = userRoleList.getRecords();
+		if (null != records && records.size() > 0) {
+			List<String> userIds = records.stream().map(SysUser::getId).collect(Collectors.toList());
+			Map<String, String> useDepNames = this.getDepNamesByUserIds(userIds);
+			for (SysUser sysUser : userRoleList.getRecords()) {
+				//设置部门
+				sysUser.setOrgCodeTxt(useDepNames.get(sysUser.getId()));
+				//设置用户职位id
+				this.userPositionId(sysUser);
+			}
+		}
+		return userRoleList;
+	}
+
 	/**
 	 * 根据角色Id查询
 	 * @param page