Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into frx

- 在 getOpenIdByCondition 和 getByCondition 方法中添加数据权限忽略逻辑
- 使用 AtomicReference 和 DataPermissionUtils.executeIgnore 包装原有逻辑，以忽略数据权限检查
- 优化代码结构，提高可读性和维护性

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/auth/AdminOauthUserOtherInfoApiImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
+import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
 import cn.iocoder.yudao.module.system.api.auth.dto.AdminOauthUserOtherInfoApiDTO;
 import cn.iocoder.yudao.module.system.api.auth.vo.AdminOauthUserOtherInfoApiVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.auth.AdminOauthUserOtherInfoDO;
@@ -13,7 +14,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 @RestController // 提供 RESTful API 接口，给 Feign 调用
 @Validated
@@ -24,20 +27,24 @@ public class AdminOauthUserOtherInfoApiImpl implements AdminOauthUserOtherInfoAp
 
 
     @Override
-    @DataPermission(enable = false)
     public CommonResult<List<AdminOauthUserOtherInfoApiVO>> getOpenIdByCondition(AdminOauthUserOtherInfoApiDTO dto) {
         AdminOauthUserOtherInfoDTO adminOauthUserOtherInfoDTO = BeanUtil.copyProperties(dto, AdminOauthUserOtherInfoDTO.class);
-        List<AdminOauthUserOtherInfoDO> list = adminOauthUserOtherInfoService.getOpenIdByCondition(adminOauthUserOtherInfoDTO);
-        return CommonResult.success(BeanUtil.copyToList(list, AdminOauthUserOtherInfoApiVO.class));
+        AtomicReference<List<AdminOauthUserOtherInfoDO>> list = new AtomicReference<>(new ArrayList<>());
+        DataPermissionUtils.executeIgnore(
+                () -> list.set(adminOauthUserOtherInfoService.getOpenIdByCondition(adminOauthUserOtherInfoDTO))
+        );
+        return CommonResult.success(BeanUtil.copyToList(list.get(), AdminOauthUserOtherInfoApiVO.class));
     }
 
     @Override
-    @DataPermission(enable = false)
     public CommonResult<AdminOauthUserOtherInfoApiVO> getByCondition(AdminOauthUserOtherInfoApiDTO dto) {
         AdminOauthUserOtherInfoDTO adminOauthUserOtherInfoDTO = BeanUtil.copyProperties(dto, AdminOauthUserOtherInfoDTO.class);
-        List<AdminOauthUserOtherInfoDO> list = adminOauthUserOtherInfoService.getOpenIdByCondition(adminOauthUserOtherInfoDTO);
-        if (CollUtil.isNotEmpty(list)) {
-            return CommonResult.success(BeanUtil.copyProperties(list.get(0), AdminOauthUserOtherInfoApiVO.class));
+        AtomicReference<List<AdminOauthUserOtherInfoDO>> list = new AtomicReference<>(new ArrayList<>());
+        DataPermissionUtils.executeIgnore(
+                () -> list.set(adminOauthUserOtherInfoService.getOpenIdByCondition(adminOauthUserOtherInfoDTO))
+        );
+        if (CollUtil.isNotEmpty(list.get())) {
+            return CommonResult.success(BeanUtil.copyProperties(list.get().get(0), AdminOauthUserOtherInfoApiVO.class));
         }
         return CommonResult.success(null);
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java

@@ -282,7 +282,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         Boolean flag = stringRedisTemplate.hasKey(key);
         // 缓存不存在
         if (Boolean.FALSE.equals(flag)) {
-            String url = "https://timor.tech/api/holiday/year/" + year;
+            String url = "http://timor.tech/api/holiday/year/" + year;
             String json = HttpUtil.get(url, 3000);
             Map<String, String> map = new HashMap<>();
             JSONObject jsonObject = JSONUtil.parseObj(json);
@@ -1190,7 +1190,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         Boolean flag = stringRedisTemplate.hasKey(key);
         // 缓存不存在
         if (Boolean.FALSE.equals(flag)) {
-            String url = "https://timor.tech/api/holiday/year/" + year;
+            String url = "http://timor.tech/api/holiday/year/" + year;
             String json = HttpUtil.get(url, 3000);
             Map<String, String> map = new HashMap<>();
             JSONObject jsonObject = JSONUtil.parseObj(json);