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 a59fa8b6e603930d8006f4d9fb4628b3052a94e1..613e470e8c47568a6a5874e7b28b627039ab1b27 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 d83d6fb06b3c65c200ff5ac185875d01b41e3d46..95a32593359a7cdd7440f1268feb43fe6f946606 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 d576eeed045b50e5b2f0da059bb05864a2476002..57f296694b809ecd546b986360568c40d8dc2ecc 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 917478e83bf20740755bc5e2165ec9014484f0bf..2e296821a3902e190e7852d55a48530b854b9791 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 e0caace83985aa4b66318417c46c58b3fb29c880..e0a2250ebfa16b6575566ae5b0222706b9120f6b 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 }