From 5d5800eb1b0f097f6eb74536a72213ed42501ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 6 Feb 2025 10:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DepartmentController.java      | 21 ++++++++++++-------
 .../mapper/TBaseDepartmentMapper.xml          |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java
index cae7a319..cbe9a1a5 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java
@@ -70,14 +70,21 @@ public class DepartmentController extends ControllerBase {
     public ApiResult<Boolean> add(@Valid @RequestBody DepartmentDTO departmentDTO){
 
         List<TBaseDepartment> checkCode = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptCode, departmentDTO.getDeptCode()).list();
-        VUtils.trueThrowBusinessError(CollUtil.isNotEmpty(checkCode)).throwMessage("编码已存在");
+        //新增
         TBaseDepartment dept = Convert.convert(TBaseDepartment.class, departmentDTO);
-        dept.setDataCreateUserNo(AdminUserUtil.getUserNo());
-        dept.setDataCreateUserName(AdminUserUtil.getUserName());
-        dept.setDataCreateTime(LocalDateTime.now());
-        dept.setDataModifyUserNo(AdminUserUtil.getUserNo());
-        dept.setDataModifyUserName(AdminUserUtil.getUserName());
-        dept.setDataModifyTime(LocalDateTime.now());
+        if(null==departmentDTO.getId() || departmentDTO.getId()==0){
+            VUtils.trueThrowBusinessError(CollUtil.isNotEmpty(checkCode)).throwMessage("编码已存在");
+            dept.setDataCreateUserNo(AdminUserUtil.getUserNo());
+            dept.setDataCreateUserName(AdminUserUtil.getUserName());
+            dept.setDataCreateTime(LocalDateTime.now());
+        }
+        else {
+
+            dept.setDeptCode(null);
+            dept.setDataModifyUserNo(AdminUserUtil.getUserNo());
+            dept.setDataModifyUserName(AdminUserUtil.getUserName());
+            dept.setDataModifyTime(LocalDateTime.now());
+        }
         departmentService.saveDepartment(dept);
         return ApiResult.success(true);
 
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml
index 4da6913b..95889129 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml
@@ -12,7 +12,7 @@
     <select id="selectListByPage" resultType="com.nflg.mobilebroken.repository.entity.TBaseDepartment">
         select *
         from t_base_department
-        where 1 = 1
+        where data_valid_status=1
         <if test="query.deptCodeOrName==null || query.deptCodeOrName==''">
             and dept_parent_id=0
         </if>