Merge remote-tracking branch 'origin/develop' into develop

fix(用户管理): 修复不传 realname 时查询用户列表抛 NPE 的问题
对 realname 参数增加非空判断，避免 null 值时调用 replaceAll 抛出 NullPointerException Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 18:29:06 +08:00 · 2026-03-30 17:22:05 +08:00
1 changed files with 4 additions and 2 deletions
@@ -192,8 +192,10 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl<HealthUserEmplo
        }
        List<String> orgCodes = GlobalUtils.getManagedCodes(filter.getOrgCode());
        filter.setOrgCodes(orgCodes);
-        // 20260330 &middot; 名字中包含·需要转义回·
-        filter.setRealname(filter.getRealname().replaceAll("&middot;", "·"));
+        // 名字中包含·（中文间隔号）时，前端可能传入 HTML 实体 &middot;，需转义回原字符
+        if (StrUtil.isNotBlank(filter.getRealname())) {
+            filter.setRealname(filter.getRealname().replaceAll("&middot;", "·"));
+        }
        IPage<UserEmployee> userEmployeeIPage = healthUserEmployeeExMapper.queryUserEmployeeList(page, filter);
        if (CollectionUtils.isEmpty(userEmployeeIPage.getRecords())) {
            return userEmployeeIPage;
Author	SHA1	Message	Date
wanghao	370f5e0089	Merge remote-tracking branch 'origin/develop' into develop	2026-03-30 18:29:06 +08:00
wanghaoandClaude Sonnet 4.6	6c08f5f141	fix(用户管理): 修复不传 realname 时查询用户列表抛 NPE 的问题对 realname 参数增加非空判断，避免 null 值时调用 replaceAll 抛出 NullPointerException Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-03-30 17:22:05 +08:00