From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
index 1c61d5d..40deee2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
@@ -2,13 +2,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.dto.Btn;
-import com.ruoyi.system.dto.SysSourcesDTO;
-import com.ruoyi.system.dto.SysSourcesListDTO;
-import com.ruoyi.system.dto.TDeptUpAndDownDTO;
import com.ruoyi.system.mapper.SysMenuMapper;
import com.ruoyi.system.model.TDept;
import com.ruoyi.system.mapper.TDeptMapper;
@@ -18,11 +11,9 @@
import com.ruoyi.system.vo.DeptVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
-import java.time.LocalDateTime;
import java.util.List;
-import java.util.Objects;
/**
* <p>
@@ -39,7 +30,7 @@
private SysMenuMapper sysMenuMapper;
@Override
public boolean isExit(TDept dto) {
- if(StringUtils.isNotEmpty(dto.getDeptId())){
+ if(StringUtils.hasLength(dto.getId())){
// 修改
return this.count(Wrappers.lambdaQuery(TDept.class).ne(TDept::getId, dto.getId()).eq(TDept::getDeptId, dto.getDeptId())) > 0;
}else {
--
Gitblit v1.7.1