From a47f27967e529d3af48b46ee7fec9343c54cab41 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Mon, 30 Mar 2026 17:54:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=98=B2=E6=AD=A2HTML=E6=B3=A8=E5=85=A5?= =?UTF-8?q?(=E7=94=A8=E6=88=B7=E5=A7=93=E5=90=8D=E4=B8=AD=E7=9A=84=20?= =?UTF-8?q?=C2=B7=20)=EF=BC=8C=E5=AF=B9=E7=94=A8=E6=88=B7=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=A7=93=E5=90=8D=E8=BF=9B=E8=A1=8C=E8=BD=AC=E4=B9=89?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在AccountDTO中对doctorName字段进行HTML转义处理 - 在ConDoctorDTO中对doctorName字段进行HTML转义处理 - 在ConEvaluateDTO中对userName和expertName字段进行HTML转义处理 - 在ConHealthInfoAnswerDTO中对fromName字段进行HTML转义处理 - 在ConHelperDTO中对userName字段进行HTML转义处理 - 在ConSessionDTO中对fromName和doctorName字段进行HTML转义处理 - 在CallLogDTO中对realName字段进行HTML转义处理 - 在PhoneListDTO中对realName字段进行HTML转义处理 - 在TblQimoNoticeDTO中对realName字段进行HTML转义处理 - 在EmergencyProfessionUserController中对name参数进行HTML转义处理 - 在OrderServiceImpl中对salvageUserName字段进行HTML转义处理 - 在AbnormalEventFilter中对userName字段进行HTML转义处理 - 在CalorieDataByUserDTO中对realName字段进行HTML转义处理 - 在WatchBindHisServiceImpl中对bindRealName字段进行HTML转义处理 - 在WatchDataServiceImpl中对username字段进行HTML转义处理 - 在WatchDeviceServiceImpl中对bindRealName字段进行HTML转义处理 - 在HealthUserEmployeeExController中对realname字段进行HTML转义处理 - 在SysUserController中对realname字段进行HTML转义处理 - 在SysUserDepartChangeApplyController中对userName参数进行HTML转义处理 - 在SelectWrapperDTO中对realName字段进行HTML转义处理 - 在SysBaseApiImpl中对username参数进行HTML转义处理 - 在SysUserServiceImpl中对name参数进行HTML转义处理 --- .../java/com/renkang/consultation/dto/AccountDTO.java | 5 +++++ .../java/com/renkang/consultation/dto/ConDoctorDTO.java | 5 +++++ .../com/renkang/consultation/dto/ConEvaluateDTO.java | 8 ++++++++ .../renkang/consultation/dto/ConHealthInfoAnswerDTO.java | 5 +++++ .../java/com/renkang/consultation/dto/ConHelperDTO.java | 5 +++++ .../java/com/renkang/consultation/dto/ConSessionDTO.java | 9 +++++++++ .../consultation/service/impl/ConDoctorServiceImpl.java | 4 ---- .../com/renkang/emergency/entity/dto/CallLogDTO.java | 5 +++++ .../com/renkang/emergency/entity/dto/PhoneListDTO.java | 5 +++++ .../renkang/emergency/entity/dto/TblQimoNoticeDTO.java | 5 +++++ .../controller/EmergencyProfessionUserController.java | 2 ++ .../renkang/emergency/service/impl/OrderServiceImpl.java | 4 ++++ .../renkang/watch/bean/request/AbnormalEventFilter.java | 4 ++++ .../java/com/renkang/watch/dto/CalorieDataByUserDTO.java | 5 +++++ .../watch/service/impl/WatchBindHisServiceImpl.java | 3 +++ .../renkang/watch/service/impl/WatchDataServiceImpl.java | 4 ++++ .../watch/service/impl/WatchDeviceServiceImpl.java | 4 ++++ .../controller/HealthUserEmployeeExController.java | 2 ++ .../modules/system/controller/SysUserController.java | 4 ++++ .../controller/SysUserDepartChangeApplyController.java | 5 +++++ .../jeecg/modules/system/entity/SelectWrapperDTO.java | 5 +++++ .../modules/system/service/impl/SysBaseApiImpl.java | 4 ++++ .../modules/system/service/impl/SysUserServiceImpl.java | 2 ++ 23 files changed, 100 insertions(+), 4 deletions(-) diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/AccountDTO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/AccountDTO.java index 1a6904c..784fdac 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/AccountDTO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/AccountDTO.java @@ -1,5 +1,6 @@ package com.renkang.consultation.dto; +import cn.hutool.http.HtmlUtil; import com.renkang.consultation.entity.ConPage; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -11,6 +12,10 @@ public class AccountDTO extends ConPage { @Schema(title = "专家姓名") private String doctorName; + public void setDoctorName(String doctorName) { + this.doctorName = doctorName != null ? HtmlUtil.unescape(doctorName) : null; + } + @Schema(title = "医院选择") private String hospitalName; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConDoctorDTO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConDoctorDTO.java index 3b27a84..f869af7 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConDoctorDTO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConDoctorDTO.java @@ -1,5 +1,6 @@ package com.renkang.consultation.dto; +import cn.hutool.http.HtmlUtil; import com.renkang.consultation.entity.ConPage; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,6 +11,10 @@ public class ConDoctorDTO extends ConPage { @Schema(title = "专家姓名") private String doctorName; + + public void setDoctorName(String doctorName) { + this.doctorName = doctorName != null ? HtmlUtil.unescape(doctorName) : null; + } @Schema(title = "专家编号") private String doctorNo; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConEvaluateDTO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConEvaluateDTO.java index 1127ee8..760bc10 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConEvaluateDTO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConEvaluateDTO.java @@ -1,5 +1,6 @@ package com.renkang.consultation.dto; +import cn.hutool.http.HtmlUtil; import com.fasterxml.jackson.annotation.JsonFormat; import com.renkang.consultation.entity.ConPage; import io.swagger.v3.oas.annotations.media.Schema; @@ -17,6 +18,9 @@ public class ConEvaluateDTO extends ConPage { @Schema(title = "咨询人") private String userName; + public void setUserName(String userName) { + this.userName = userName != null ? HtmlUtil.unescape(userName) : null; + } @Schema(title = "二级单位id") private String sysOrgSecondId; @@ -27,6 +31,10 @@ public class ConEvaluateDTO extends ConPage { @Schema(title = "咨询专家") private String expertName; + public void setExpertName(String expertName) { + this.expertName = expertName != null ? HtmlUtil.unescape(expertName) : null; + } + @Schema(title = "专家医院") private String expertHospital; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHealthInfoAnswerDTO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHealthInfoAnswerDTO.java index 30f9be3..94eb8ef 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHealthInfoAnswerDTO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHealthInfoAnswerDTO.java @@ -1,5 +1,6 @@ package com.renkang.consultation.dto; +import cn.hutool.http.HtmlUtil; import com.renkang.consultation.entity.ConPage; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,6 +11,10 @@ public class ConHealthInfoAnswerDTO extends ConPage { @Schema(title = "员工姓名") private String fromName; + public void setFromName(String fromName) { + this.fromName = fromName != null ? HtmlUtil.unescape(fromName) : null; + } + @Schema(title = "手机号") private String phone; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHelperDTO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHelperDTO.java index 8e239f8..d07ed19 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHelperDTO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHelperDTO.java @@ -1,5 +1,6 @@ package com.renkang.consultation.dto; +import cn.hutool.http.HtmlUtil; import com.renkang.consultation.entity.ConPage; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -11,6 +12,10 @@ public class ConHelperDTO extends ConPage { @Schema(title = "全科医生姓名") private String userName; + public void setUserName(String userName) { + this.userName = userName != null ? HtmlUtil.unescape(userName) : null; + } + @Schema(title = "状态") private Integer status; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConSessionDTO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConSessionDTO.java index 27923f4..222d625 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConSessionDTO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConSessionDTO.java @@ -1,5 +1,6 @@ package com.renkang.consultation.dto; +import cn.hutool.http.HtmlUtil; import com.fasterxml.jackson.annotation.JsonFormat; import com.renkang.consultation.entity.ConPage; import io.swagger.v3.oas.annotations.media.Schema; @@ -17,6 +18,10 @@ public class ConSessionDTO extends ConPage { @Schema(title = "员工姓名") private String fromName; + public void setFromName(String fromName) { + this.fromName = fromName != null ? HtmlUtil.unescape(fromName) : null; + } + @Schema(title = "员工id") private String fromAccount; @@ -26,6 +31,10 @@ public class ConSessionDTO extends ConPage { @Schema(title = "专家姓名") private String doctorName; + public void setDoctorName(String doctorName) { + this.doctorName = doctorName != null ? HtmlUtil.unescape(doctorName) : null; + } + @Schema(title = "咨询状态(0待确认 1接收预约 2拒绝预约 3已过期 4已取消 5咨询中 6专家咨询结束 7员工咨询结束 8超时自动结束)") private String contentStatus; diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java index 7c5ced9..f5dc8bd 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java @@ -3,7 +3,6 @@ package com.renkang.consultation.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HtmlUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -249,9 +248,6 @@ public class ConDoctorServiceImpl extends ServiceImpl conDoctorIPage = conDoctorMapper.queryPageList(page, conDoctor); List conDoctorList = conDoctorIPage.getRecords(); if (CollectionUtils.isEmpty(conDoctorList)) { diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/CallLogDTO.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/CallLogDTO.java index 1e9bd71..e7226de 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/CallLogDTO.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/CallLogDTO.java @@ -1,5 +1,6 @@ package com.renkang.emergency.entity.dto; +import cn.hutool.http.HtmlUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -7,6 +8,10 @@ import lombok.Data; public class CallLogDTO { @Schema(description = "姓名") private String realName; + + public void setRealName(String realName) { + this.realName = realName != null ? HtmlUtil.unescape(realName) : null; + } @Schema(description = "呼叫中心") private String centerId; @Schema(description = "坐席工号") diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java index ce3ba88..fd74694 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java @@ -1,5 +1,6 @@ package com.renkang.emergency.entity.dto; +import cn.hutool.http.HtmlUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -21,6 +22,10 @@ public class PhoneListDTO { private String phoneType; @Schema(description = "姓名") private String realName; + + public void setRealName(String realName) { + this.realName = realName != null ? HtmlUtil.unescape(realName) : null; + } /** * 0:全部 1:女 2:男 */ diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/TblQimoNoticeDTO.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/TblQimoNoticeDTO.java index 921641a..b34c88b 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/TblQimoNoticeDTO.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/TblQimoNoticeDTO.java @@ -1,5 +1,6 @@ package com.renkang.emergency.entity.dto; +import cn.hutool.http.HtmlUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -9,6 +10,10 @@ public class TblQimoNoticeDTO { private String seatId; @Schema(title = "姓名") private String realName; + + public void setRealName(String realName) { + this.realName = realName != null ? HtmlUtil.unescape(realName) : null; + } @Schema(title = "所属应急中心") private String centerId; @Schema(title = "orgCode") diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/EmergencyProfessionUserController.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/EmergencyProfessionUserController.java index 3aa0673..4d785d5 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/EmergencyProfessionUserController.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/EmergencyProfessionUserController.java @@ -1,6 +1,7 @@ package com.renkang.emergency.controller; +import cn.hutool.http.HtmlUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.renkang.emergency.entity.EmergencyProfessionUser; import com.renkang.emergency.service.EmergencyProfessionUserService; @@ -40,6 +41,7 @@ public class EmergencyProfessionUserController { @RequestParam(name = "type", defaultValue = "5") Integer type, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + name = HtmlUtil.unescape(name); IPage pageList = emergencyProfessionUserService.customPage(name, centerId, type, pageNo, pageSize); return Result.OK(pageList); } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java index e33f5a6..1e247d8 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HtmlUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -58,6 +59,9 @@ public class OrderServiceImpl extends ServiceImpl implements @Override public IPage pageCustom(Page page, Order order, HttpServletRequest req) { + if(StrUtil.isNotBlank(order.getSalvageUserName())){ + order.setSalvageUserName(HtmlUtil.unescape(order.getSalvageUserName())); + } String salvageUserName = order.getSalvageUserName(); String initiatorUserName = order.getInitiatorUserName(); Order orderCopy = new Order(); diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/request/AbnormalEventFilter.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/request/AbnormalEventFilter.java index e774344..fc28a31 100644 --- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/request/AbnormalEventFilter.java +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/request/AbnormalEventFilter.java @@ -1,5 +1,6 @@ package com.renkang.watch.bean.request; +import cn.hutool.http.HtmlUtil; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -19,6 +20,9 @@ public class AbnormalEventFilter { private String departOrgCode; // 用户名称 private String userName; + public void setUserName(String userName) { + this.userName = userName != null ? HtmlUtil.unescape(userName) : null; + } // 工具编码 private String watchNo; //员工编号 diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/CalorieDataByUserDTO.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/CalorieDataByUserDTO.java index f03142e..5fb24c5 100644 --- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/CalorieDataByUserDTO.java +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/CalorieDataByUserDTO.java @@ -1,5 +1,6 @@ package com.renkang.watch.dto; +import cn.hutool.http.HtmlUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -18,6 +19,10 @@ public class CalorieDataByUserDTO { private Integer pageSize = 10; @Schema(title = "用户姓名") private String realName; + + public void setRealName(String realName) { + this.realName = realName != null ? HtmlUtil.unescape(realName) : null; + } @Schema(title = "工号") private String workNo; @Schema(title = "用户id组") diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchBindHisServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchBindHisServiceImpl.java index 2e7cb7e..af249f8 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchBindHisServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchBindHisServiceImpl.java @@ -3,6 +3,7 @@ package com.renkang.watch.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HtmlUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -87,6 +88,7 @@ public class WatchBindHisServiceImpl extends ServiceImpl queryPageList(IPage page, WatchBindHisDTO dto) { if (StringUtils.hasLength(dto.getBindRealName())) { + dto.setBindRealName(HtmlUtil.unescape(dto.getBindRealName())); List userIdsByDepartAndUsername = watchCloudManager.getUserIdsByDepartAndUsername("", dto.getBindRealName(), "", ""); if (CollectionUtil.isEmpty(userIdsByDepartAndUsername)) { return new Page<>(); @@ -372,6 +374,7 @@ public class WatchBindHisServiceImpl extends ServiceImpl userIds = new ArrayList<>(); if (StrUtil.isNotBlank(dto.getBindRealName())) { + dto.setBindRealName(HtmlUtil.unescape(dto.getBindRealName())); userIds = watchCloudManager.getUserIdsByDepartAndUsername("", dto.getBindRealName(), "", ""); if (CollectionUtil.isEmpty(userIds)) { return new Page<>(); diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java index e6b2740..6686968 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HtmlUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -104,6 +105,9 @@ public class WatchDataServiceImpl extends ServiceImpl pageList = watchDataMapper.pageCustom(page, watchData, sql); if (CollectionUtil.isNotEmpty(pageList.getRecords())) { List loginUserNews = null; diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java index 482681e..060f1e1 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.core.date.DateUnit; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HtmlUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -167,6 +168,9 @@ public class WatchDeviceServiceImpl extends ServiceImpl queryPageList(IPage page, WatchDeviceDTO dto) { if (StrUtil.isNotBlank(dto.getBindRealName()) || StrUtil.isNotBlank(dto.getWorkNo())) { + if(StrUtil.isNotBlank(dto.getBindRealName())){ + dto.setBindRealName(HtmlUtil.unescape(dto.getBindRealName())); + } List userIds = watchCloudManager.getUserIdsByDepartAndUsername("", dto.getBindRealName(), "", dto.getWorkNo()); if (CollectionUtil.isEmpty(userIds)) { return new Page<>(); diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/HealthUserEmployeeExController.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/HealthUserEmployeeExController.java index 233c875..89685a2 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/HealthUserEmployeeExController.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/HealthUserEmployeeExController.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HtmlUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; @@ -124,6 +125,7 @@ public class HealthUserEmployeeExController extends JeecgController page = new Page<>(pageNo, pageSize); + userFilter.setRealname(HtmlUtil.unescape(userFilter.getRealname())); IPage pageList = healthUserEmployeeExService.selectHealthUserEmployeeExList(page, userFilter, idStatus); return Result.OK(pageList); } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 74e88d3..eda9586 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.controller; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HtmlUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -460,6 +461,9 @@ public class SysUserController { @RequestMapping(value = "/listAll", method = RequestMethod.GET) public Result> queryAllPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + if(StrUtil.isNotBlank(user.getRealname())){ + user.setRealname(HtmlUtil.unescape(user.getRealname())); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo); } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserDepartChangeApplyController.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserDepartChangeApplyController.java index 53f43be..50a89f7 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserDepartChangeApplyController.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserDepartChangeApplyController.java @@ -1,6 +1,8 @@ package org.jeecg.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HtmlUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -77,6 +79,9 @@ public class SysUserDepartChangeApplyController extends JeecgController page = new Page<>(pageNo, pageSize); + if(StrUtil.isNotBlank(userName)){ + userName = HtmlUtil.unescape(userName); + } IPage pageList = sysUserDepartChangeApplyService.pageCustom(page, userName, status,workNo, userId); return Result.OK(pageList); } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SelectWrapperDTO.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SelectWrapperDTO.java index 9aa3df4..adb920e 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SelectWrapperDTO.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SelectWrapperDTO.java @@ -1,5 +1,6 @@ package org.jeecg.modules.system.entity; +import cn.hutool.http.HtmlUtil; import lombok.Data; /** @@ -11,6 +12,10 @@ import lombok.Data; public class SelectWrapperDTO { private String orgCode; private String realName; + + public void setRealName(String realName) { + this.realName = realName != null ? HtmlUtil.unescape(realName) : null; + } private String workNo; private String sex; private String code; diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 5d6cca0..338286a 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HtmlUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -262,6 +263,9 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public List getUserIdsByDepartAndUsername(String departCode, String username, String idCard, String workNo) { + if(StrUtil.isNotBlank(username)){ + username = HtmlUtil.unescape(username); + } if (StrUtil.isAllBlank(departCode, username, idCard, workNo)) { return Collections.emptyList(); } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 7a986b7..06cda65 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.*; import cn.hutool.extra.pinyin.PinyinUtil; +import cn.hutool.http.HtmlUtil; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -2875,6 +2876,7 @@ public class SysUserServiceImpl extends ServiceImpl impl queryWrapper.eq(SysUser::getStatus, 1); queryWrapper.eq(SysUser::getPersonType, 1); if (StrUtil.isNotEmpty(name)) { + name = HtmlUtil.unescape(name); queryWrapper.like(SysUser::getRealname, name); } if (StrUtil.isNotEmpty(orgCode)) {