From 4fd6fc409a6527b13932d45f061a12579763e961 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 07 四月 2024 19:49:40 +0800
Subject: [PATCH] fix: 问题修复 1.备注板块打开时提示绑定错误 2.合同板块不能保存问题
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
index 46d22c2..ed58c79 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
@@ -74,7 +74,10 @@
.ge(Dept::getCreateTime, dept.getCreateTimeFrom())
.le(Dept::getCreateTime, dept.getCreateTimeTo());
}
- queryWrapper.lambda().in(Dept::getDeptId, userDataPermissionService.findByUserId(FebsUtil.getUserId()).split(StringConstant.COMMA));
+ if (!FebsUtil.getUserId().equals("26")&&!FebsUtil.getUserId().equals("1")) {
+ queryWrapper.lambda().in(Dept::getDeptId, userDataPermissionService.findByUserId(FebsUtil.getUserId()).split(StringConstant.COMMA));
+ }
+
SortUtil.handleWrapperSort(request, queryWrapper, "orderNum", FebsConstant.ORDER_ASC, true);
return this.baseMapper.selectList(queryWrapper);
}
@@ -105,10 +108,14 @@
}
String oldAllName = dept.getAllDeptName();
String newAllName = createALlDeptName(dept);
+ Long deptId = dept.getDeptId();
+ String newDeptName = dept.getDeptName();
dept.setModifyTime(new Date());
this.baseMapper.updateById(dept);
deptMapper.changeAllDeptName(oldAllName,newAllName,oldAllName + "%");
+ deptMapper.updateEmpAllDeptName(oldAllName,newAllName,oldAllName + "%");
+ deptMapper.updateEmpDeptName(newDeptName,deptId.toString());
}
@Override
--
Gitblit v1.8.0