From 4230d37c076b29830e22225d005602f324a5a66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B3=95=E6=8B=8951246?= <719602854@qq.com> Date: Fri, 6 Jun 2025 18:19:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=8C=E5=85=B6=E4=BB=96=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/system/dal/dataobject/dept/DeptDO.java | 5 ++--- .../yudao/module/system/service/dept/DeptServiceImpl.java | 6 +++--- .../yudao/module/visit/service/home/HomeServiceImpl.java | 4 ++-- yudao-ui/yudao-ui-admin-vue3/.env | 6 +++--- .../yudao-ui-admin-vue3/src/views/Login/SocialLogin.vue | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java index a59fa8b..613e470 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java @@ -3,9 +3,7 @@ package cn.iocoder.yudao.module.system.dal.dataobject.dept; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -47,6 +45,7 @@ public class DeptDO extends TenantBaseDO { * * 关联 {@link AdminUserDO#getId()} */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Long leaderUserId; /** * 联系电话 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index d83d6fb..95a3259 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -68,12 +68,12 @@ public class DeptServiceImpl implements DeptService { validateParentDept(updateReqVO.getId(), updateReqVO.getParentId()); // 校验部门名的唯一性 validateDeptNameUnique(updateReqVO.getId(), updateReqVO.getParentId(), updateReqVO.getName()); + // 更新部门 + DeptDO updateObj = BeanUtils.toBean(updateReqVO, DeptDO.class); //如果没有leaderUserId说明是删除了leaderUserId if (ObjectUtil.isNull(updateReqVO.getLeaderUserId())) { - updateReqVO.setLeaderUserId(null); + updateObj.setLeaderUserId(null); } - // 更新部门 - DeptDO updateObj = BeanUtils.toBean(updateReqVO, DeptDO.class); deptMapper.updateById(updateObj); } diff --git a/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/home/HomeServiceImpl.java b/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/home/HomeServiceImpl.java index d576eee..57f2966 100644 --- a/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/home/HomeServiceImpl.java +++ b/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/home/HomeServiceImpl.java @@ -180,7 +180,7 @@ public class HomeServiceImpl implements HomeService { // 倒序排序，取前10 List> top10 = countMap.entrySet().stream() - .sorted(Map.Entry.comparingByValue().reversed()) + .sorted(Map.Entry.comparingByValue()) .limit(10) .collect(Collectors.toList()); @@ -361,7 +361,7 @@ public class HomeServiceImpl implements HomeService { // 5. 排序取前 N（如 top10） List> topList = statMap.entrySet().stream() - .sorted(Map.Entry.comparingByValue().reversed()) + .sorted(Map.Entry.comparingByValue()) .limit(10) .collect(Collectors.toList()); diff --git a/yudao-ui/yudao-ui-admin-vue3/.env b/yudao-ui/yudao-ui-admin-vue3/.env index 917478e..2e29682 100644 --- a/yudao-ui/yudao-ui-admin-vue3/.env +++ b/yudao-ui/yudao-ui-admin-vue3/.env @@ -20,6 +20,6 @@ VITE_APP_DOCALERT_ENABLE=false VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc # 默认账户密码 -VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码 -VITE_APP_DEFAULT_LOGIN_USERNAME = admin -VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 +VITE_APP_DEFAULT_LOGIN_TENANT = +VITE_APP_DEFAULT_LOGIN_USERNAME = +VITE_APP_DEFAULT_LOGIN_PASSWORD = diff --git a/yudao-ui/yudao-ui-admin-vue3/src/views/Login/SocialLogin.vue b/yudao-ui/yudao-ui-admin-vue3/src/views/Login/SocialLogin.vue index e0caace..e0a2250 100644 --- a/yudao-ui/yudao-ui-admin-vue3/src/views/Login/SocialLogin.vue +++ b/yudao-ui/yudao-ui-admin-vue3/src/views/Login/SocialLogin.vue @@ -199,9 +199,9 @@ const loginData = reactive({ captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false', tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', loginForm: { - tenantName: '芋道源码', - username: 'admin', - password: 'admin123', + tenantName: '', + username: '', + password: '', captchaVerification: '', rememberMe: false } -- 2.22.0