From 31e2c98c3a12d3de1e483e0600c9d8e79a1a994c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Fri, 22 Aug 2025 14:17:44 +0800 Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screendisasterdata/ScreenDisasterDataMapper.xml | 12 ++++++++++++ .../system/dal/mysql/user/AdminUserMapper.java | 1 - ...nelManagementMapper.java => PersonnelMapper.java} | 2 +- .../system/service/user/AdminUserServiceImpl.java | 6 +++--- 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 yudao-module-farm/src/main/resources/mapper/screendisasterdata/ScreenDisasterDataMapper.xml rename yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/{PersonnelManagementMapper.java => PersonnelMapper.java} (74%) diff --git a/yudao-module-farm/src/main/resources/mapper/screendisasterdata/ScreenDisasterDataMapper.xml b/yudao-module-farm/src/main/resources/mapper/screendisasterdata/ScreenDisasterDataMapper.xml new file mode 100644 index 00000000..32f57d18 --- /dev/null +++ b/yudao-module-farm/src/main/resources/mapper/screendisasterdata/ScreenDisasterDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java index 0ab7330a..c0c9be8e 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.PersonnelManagementDO; import org.apache.ibatis.annotations.Mapper; import java.util.Collection; diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelManagementMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelMapper.java similarity index 74% rename from yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelManagementMapper.java rename to yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelMapper.java index 9ca99650..64449fc5 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelManagementMapper.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelMapper.java @@ -5,6 +5,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.PersonnelManagementDO; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface PersonnelManagementMapper extends BaseMapperX { +public interface PersonnelMapper extends BaseMapperX { } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index 88a4fe46..66e61edd 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -26,7 +26,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.PersonnelManagementDO; import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; -import cn.iocoder.yudao.module.system.dal.mysql.user.PersonnelManagementMapper; +import cn.iocoder.yudao.module.system.dal.mysql.user.PersonnelMapper; import cn.iocoder.yudao.module.system.service.dept.DeptService; import cn.iocoder.yudao.module.system.service.dept.PostService; import cn.iocoder.yudao.module.system.service.permission.PermissionService; @@ -86,7 +86,7 @@ public class AdminUserServiceImpl implements AdminUserService { private ConfigApi configApi; @Resource - private PersonnelManagementMapper personnelManagementMapper; + private PersonnelMapper personnelMapper; @Override @Transactional(rollbackFor = Exception.class) @@ -135,7 +135,7 @@ public class AdminUserServiceImpl implements AdminUserService { } userDo.setRole(roles); userDo.setId(IdUtil.fastUUID()); - personnelManagementMapper.insert(userDo); + personnelMapper.insert(userDo); return user.getId(); }