From d89118c8c2f83e4d39f05b774e9019141f0a6341 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 24 九月 2025 09:35:11 +0800
Subject: [PATCH] fix: 修复数据库表名大小写不一致问题及SQL查询错误

---
 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 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 9618758..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
@@ -1,12 +1,17 @@
 package cc.mrbird.febs.server.system.service.impl;
 
+import cc.mrbird.febs.common.core.constant.ModuleCode;
 import cc.mrbird.febs.common.core.entity.DeptTree;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
 import cc.mrbird.febs.common.core.entity.Tree;
 import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
 import cc.mrbird.febs.common.core.entity.constant.PageConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.Dept;
 import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.entity.system.UserDataPermission;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
 import cc.mrbird.febs.common.core.utils.SortUtil;
 import cc.mrbird.febs.common.core.utils.TreeUtil;
 import cc.mrbird.febs.common.redis.service.RedisService;
@@ -36,6 +41,7 @@
 public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
     private final RedisService redisService;
     private final IUserDataPermissionService userDataPermissionService;
+    private final DeptMapper deptMapper;
 
     @Override
     public Map<String, Object> findDepts(QueryRequest request, Dept dept) {
@@ -68,6 +74,10 @@
                     .ge(Dept::getCreateTime, dept.getCreateTimeFrom())
                     .le(Dept::getCreateTime, dept.getCreateTimeTo());
         }
+        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);
     }
@@ -75,11 +85,19 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createDept(Dept dept) {
+        long deptId = SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM);
+        dept.setDeptId(deptId);
         if (dept.getParentId() == null) {
             dept.setParentId(Dept.TOP_DEPT_ID);
         }
+        dept.setAllDeptName(createALlDeptName(dept));
         dept.setCreateTime(new Date());
         this.save(dept);
+
+        UserDataPermission userDataPermission = new UserDataPermission();
+        userDataPermission.setDeptId(deptId);
+        userDataPermission.setUserId(Long.parseLong(FebsUtil.getUserId()));
+        userDataPermissionService.save(userDataPermission);
     }
 
     @Override
@@ -88,8 +106,16 @@
         if (dept.getParentId() == null) {
             dept.setParentId(Dept.TOP_DEPT_ID);
         }
+        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
@@ -99,12 +125,13 @@
     }
 
     @Override
-    public void setDeptRedis() {
+    public List<Dept> setDeptRedis() {
         LambdaQueryWrapper<Dept> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Dept::getDelFlag, 0);
         List<Dept> depts =  this.baseMapper.selectList(queryWrapper);
         redisService.del("depts");
         redisService.set("depts", depts);
+        return depts;
     }
 
     @Override
@@ -124,6 +151,9 @@
             tree.setParentId(dept.getParentId().toString());
             tree.setLabel(dept.getDeptName());
             tree.setOrderNum(dept.getOrderNum());
+            tree.setDeptFunction(dept.getDeptFunction());
+            tree.setDeptType(dept.getDeptType());
+            tree.setAllDeptName(dept.getAllDeptName());
             trees.add(tree);
         });
     }
@@ -142,4 +172,13 @@
         }
     }
 
+    private String createALlDeptName(Dept dept){
+        Dept parent = this.getById(dept.getParentId());
+        String parentName = parent.getAllDeptName();
+        if(StringUtils.isNotBlank(parentName)) {
+            return parent.getAllDeptName() + "/" + dept.getDeptName();
+        } else {
+            return dept.getDeptName();
+        }
+    }
 }

--
Gitblit v1.8.0