Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into dev-aikai-解决单双休考勤

This commit is contained in:
aikai 2024-12-18 14:34:15 +08:00
commit 4eb18d3664

View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.api.auth;
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.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;
@ -23,6 +24,7 @@ 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);
@ -30,6 +32,7 @@ public class AdminOauthUserOtherInfoApiImpl implements AdminOauthUserOtherInfoAp
}
@Override
@DataPermission(enable = false)
public CommonResult<AdminOauthUserOtherInfoApiVO> getByCondition(AdminOauthUserOtherInfoApiDTO dto) {
AdminOauthUserOtherInfoDTO adminOauthUserOtherInfoDTO = BeanUtil.copyProperties(dto, AdminOauthUserOtherInfoDTO.class);
List<AdminOauthUserOtherInfoDO> list = adminOauthUserOtherInfoService.getOpenIdByCondition(adminOauthUserOtherInfoDTO);