From 2b53048bdad1abd367af8aed04c78e347c53c2f7 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 21 May 2024 14:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9Euser=5Ftype=E5=AD=97=E6=AE=B5=20=20?= =?UTF-8?q?=E5=AF=B9=E7=94=A8=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=BA=94sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dal/dataobject/user/AdminUserDO.java | 5 +++++ .../system/dal/mysql/user/AdminUserMapper.java | 14 +++++++++++--- .../service/user/AdminUserServiceImpl.java | 17 ----------------- .../resources/mapper/user/AdminUserMapper.xml | 13 ++++++++----- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java index 258c2592..e51baca3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java @@ -92,6 +92,11 @@ public class AdminUserDO extends TenantBaseDO { * 枚举 {@link CommonStatusEnum} */ private Integer status; + /** + * 用户类型 + * 1：公司用户 2：工厂用户 + */ + private Integer userType; /** * 最后登录IP */ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java index 72443122..97c5d70f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java @@ -38,6 +38,7 @@ public interface AdminUserMapper extends BaseMapperX { .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) .inIfPresent(AdminUserDO::getDeptId, deptIds) + .eq(AdminUserDO::getUserType, 1) //查询公司用户 .orderByDesc(AdminUserDO::getId)); } @@ -46,17 +47,24 @@ public interface AdminUserMapper extends BaseMapperX { } default List selectListByStatus(Integer status) { - return selectList(AdminUserDO::getStatus, status); + + return selectList(new LambdaQueryWrapperX() + .eq(AdminUserDO::getStatus, status) + .eq(AdminUserDO::getUserType, 1)); } default List selectListByDeptIds(Collection deptIds) { - return selectList(AdminUserDO::getDeptId, deptIds); + + return selectList(new LambdaQueryWrapperX() + .in(AdminUserDO::getDeptId, deptIds) + .eq(AdminUserDO::getUserType, 1)); } default List selectListByDeptId(Long deptId, Long userId) { return selectList(new LambdaQueryWrapperX() .eq(AdminUserDO::getDeptId, deptId) - .ne(AdminUserDO::getId, userId)); + .ne(AdminUserDO::getId, userId) + .eq(AdminUserDO::getUserType , 1)); } void emptyOpenId(@Param("openId") String openId); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index ea8d2875..31eef3e9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -33,12 +33,10 @@ import org.springframework.context.annotation.Lazy; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -544,21 +542,6 @@ public class AdminUserServiceImpl implements AdminUserService { return passwordEncoder.encode(password); } - private void IdCardAnalysis(AdminUserDO updateUser) { - - LocalDate nowDate = LocalDate.now(); - - String idCard = updateUser.getIdcard(); - - //通过身份证号码 获得出生日期 - LocalDate date = LocalDate.parse(idCard.substring(6, 14)); - //通过身份证号码 获得性别 - Integer sex = Integer.parseInt(idCard.substring(16, 17)) % 2 == 0 ? 2 : 1; - //通过身份证号码 获得年龄 - Integer age = nowDate.getYear() - date.getYear(); - - } - @Override public String getSignImgPath(Long userId) { //2L 用户签名 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml index c8b5e294..f6985cc7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml @@ -17,11 +17,14 @@