From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 9 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
index 9ca16f8..00a15e4 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
@@ -20,9 +20,11 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -45,6 +47,7 @@
@Override
public Long createAttendanceRule(HrmAttendanceRuleSaveReqVO createReqVO) {
+ validateLocation(createReqVO);
// 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅
validateAttendanceRuleNameUnique(null, createReqVO.getName());
// 鏍￠獙閮ㄩ棬鏄惁宸查厤缃鍒欙紙濡傛灉鎸囧畾浜嗛儴闂級
@@ -71,7 +74,21 @@
@Override
public void updateAttendanceRule(HrmAttendanceRuleSaveReqVO updateReqVO) {
- validateAttendanceRuleExists(updateReqVO.getId());
+ HrmAttendanceRuleDO currentRule = attendanceRuleMapper.selectById(updateReqVO.getId());
+ if (currentRule == null) {
+ throw exception(ATTENDANCE_RULE_NOT_EXISTS);
+ }
+ // 鍏煎灏氭湭浼犲湴鐐瑰瓧娈电殑鏃х鐞嗙锛岄伩鍏嶇紪杈戠彮娆℃椂鎰忓鍏抽棴宸查厤缃殑浣嶇疆闄愬埗銆�
+ if (updateReqVO.getLocationRequired() == null) {
+ updateReqVO.setLocationRequired(currentRule.getLocationRequired());
+ if (updateReqVO.getLocationName() == null) updateReqVO.setLocationName(currentRule.getLocationName());
+ if (updateReqVO.getLocationAddress() == null) updateReqVO.setLocationAddress(currentRule.getLocationAddress());
+ if (updateReqVO.getLongitude() == null) updateReqVO.setLongitude(currentRule.getLongitude());
+ if (updateReqVO.getLatitude() == null) updateReqVO.setLatitude(currentRule.getLatitude());
+ if (updateReqVO.getRadiusMeters() == null) updateReqVO.setRadiusMeters(currentRule.getRadiusMeters());
+ if (updateReqVO.getCoordinateSystem() == null) updateReqVO.setCoordinateSystem(currentRule.getCoordinateSystem());
+ }
+ validateLocation(updateReqVO);
// 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅
validateAttendanceRuleNameUnique(updateReqVO.getId(), updateReqVO.getName());
// 鏍￠獙閮ㄩ棬鏄惁宸查厤缃鍒欙紙濡傛灉鎸囧畾浜嗛儴闂級
@@ -91,6 +108,39 @@
private void validateAttendanceRuleExists(Long id) {
if (attendanceRuleMapper.selectById(id) == null) {
throw exception(ATTENDANCE_RULE_NOT_EXISTS);
+ }
+ }
+
+ private void validateLocation(HrmAttendanceRuleSaveReqVO reqVO) {
+ if (reqVO.getLocationRequired() == null) {
+ reqVO.setLocationRequired(false);
+ }
+ if (reqVO.getRadiusMeters() == null) {
+ reqVO.setRadiusMeters(200);
+ }
+ if (StrUtil.isBlank(reqVO.getCoordinateSystem())) {
+ reqVO.setCoordinateSystem("WGS84");
+ } else {
+ reqVO.setCoordinateSystem(reqVO.getCoordinateSystem().trim().toUpperCase(java.util.Locale.ROOT));
+ }
+ if (!"WGS84".equals(reqVO.getCoordinateSystem())) {
+ throw exception(ATTENDANCE_LOCATION_SYSTEM_INVALID);
+ }
+ if (reqVO.getLongitude() != null && (reqVO.getLongitude().compareTo(BigDecimal.valueOf(-180)) < 0
+ || reqVO.getLongitude().compareTo(BigDecimal.valueOf(180)) > 0)) {
+ throw exception(ATTENDANCE_LOCATION_COORDINATE_INVALID);
+ }
+ if (reqVO.getLatitude() != null && (reqVO.getLatitude().compareTo(BigDecimal.valueOf(-90)) < 0
+ || reqVO.getLatitude().compareTo(BigDecimal.valueOf(90)) > 0)) {
+ throw exception(ATTENDANCE_LOCATION_COORDINATE_INVALID);
+ }
+ if (reqVO.getRadiusMeters() < 10 || reqVO.getRadiusMeters() > 5000) {
+ throw exception(ATTENDANCE_LOCATION_RULE_INVALID);
+ }
+ if (Boolean.TRUE.equals(reqVO.getLocationRequired())
+ && (StrUtil.isBlank(reqVO.getLocationName()) || reqVO.getLongitude() == null
+ || reqVO.getLatitude() == null || StrUtil.isBlank(reqVO.getCoordinateSystem()))) {
+ throw exception(ATTENDANCE_LOCATION_RULE_INVALID);
}
}
@@ -136,17 +186,26 @@
@Override
public HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId) {
- // 1. 鍏堟煡鎵鹃儴闂ㄤ笓灞炶鍒�
- List<HrmAttendanceRuleDO> deptRules = attendanceRuleMapper.selectList(new cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX<HrmAttendanceRuleDO>()
- .eq(HrmAttendanceRuleDO::getDeptId, deptId)
- .eq(HrmAttendanceRuleDO::getStatus, 0));
- if (!deptRules.isEmpty()) {
- return deptRules.get(0);
+ // 1. 浠庡憳宸ユ墍鍦ㄩ儴闂ㄥ紑濮嬮�愮骇鍚戜笂鏌ユ壘锛氶厤缃湪涓婄骇閮ㄩ棬鐨勮鍒欏鍏跺瓙閮ㄩ棬鐢熸晥
+ Set<Long> visitedDeptIds = new HashSet<>();
+ Long currentDeptId = deptId;
+ while (currentDeptId != null && currentDeptId != 0 && visitedDeptIds.add(currentDeptId)) {
+ List<HrmAttendanceRuleDO> deptRules = attendanceRuleMapper.selectEnabledListByDeptId(currentDeptId);
+ if (!deptRules.isEmpty()) {
+ // 鍚屼竴閮ㄩ棬锛堝銆屾�诲叕鍙搞�嶏級鍙兘閰嶇疆浜嗗鏉″惎鐢ㄨ鍒欙紝浠ユ渶鏂板垱寤虹殑涓哄綋鍓嶇敓鏁堣鍒�
+ return deptRules.get(0);
+ }
+ DeptRespDTO dept = deptApi.getDept(currentDeptId);
+ if (dept == null) {
+ break;
+ }
+ currentDeptId = dept.getParentId();
}
// 2. 鏌ユ壘鍏ㄥ眬瑙勫垯锛坉eptId 涓� null锛�
List<HrmAttendanceRuleDO> globalRules = attendanceRuleMapper.selectList(new cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX<HrmAttendanceRuleDO>()
.isNull(HrmAttendanceRuleDO::getDeptId)
- .eq(HrmAttendanceRuleDO::getStatus, 0));
+ .eq(HrmAttendanceRuleDO::getStatus, 0)
+ .orderByDesc(HrmAttendanceRuleDO::getId));
if (!globalRules.isEmpty()) {
return globalRules.get(0);
}
@@ -224,4 +283,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3