Commit 4230d37c authored by 法拉51246's avatar 法拉51246

除了数据权限,其他完成

密码去除
parent 37420f94
......@@ -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;
/**
* 联系电话
......
......@@ -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);
}
......
......@@ -180,7 +180,7 @@ public class HomeServiceImpl implements HomeService {
// 倒序排序,取前10
List<Map.Entry<String, Long>> top10 = countMap.entrySet().stream()
.sorted(Map.Entry.<String, Long>comparingByValue().reversed())
.sorted(Map.Entry.<String, Long>comparingByValue())
.limit(10)
.collect(Collectors.toList());
......@@ -361,7 +361,7 @@ public class HomeServiceImpl implements HomeService {
// 5. 排序取前 N(如 top10)
List<Map.Entry<String, Integer>> topList = statMap.entrySet().stream()
.sorted(Map.Entry.<String, Integer>comparingByValue().reversed())
.sorted(Map.Entry.<String, Integer>comparingByValue())
.limit(10)
.collect(Collectors.toList());
......
......@@ -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 =
......@@ -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
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment