From 8bd2686b73046ba6a13867078ddb4497fe95d2f3 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 18:05:46 +0800
Subject: [PATCH] 添加部门同名验证

---
 consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java    |   36 ++++++++++--------
 consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java |   59 ++++++++++++-----------------
 admin-web/src/views/systemSetting/department/edit.vue                                         |    6 +-
 consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java          |    7 +--
 admin-web/src/views/systemSetting/department/index.vue                                        |    2 
 5 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/admin-web/src/views/systemSetting/department/edit.vue b/admin-web/src/views/systemSetting/department/edit.vue
index b0a657a..8fe05ea 100644
--- a/admin-web/src/views/systemSetting/department/edit.vue
+++ b/admin-web/src/views/systemSetting/department/edit.vue
@@ -18,8 +18,8 @@
       </el-form-item>
       <el-form-item label="鐘舵��" prop="status">
         <el-radio-group v-model="formData.status">
-          <el-radio :label="0">姝e父</el-radio>
-          <el-radio :label="1">绂佺敤</el-radio>
+          <el-radio :label="1">姝e父</el-radio>
+          <el-radio :label="0">绂佺敤</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="椤哄簭" prop="orderNum">
@@ -66,7 +66,7 @@
         tenantId:'',
         name:'',
         code:'',
-        status:0,
+        status:1,
         orderNum:1
       },
       rules: {
diff --git a/admin-web/src/views/systemSetting/department/index.vue b/admin-web/src/views/systemSetting/department/index.vue
index c82fc3f..8102e46 100644
--- a/admin-web/src/views/systemSetting/department/index.vue
+++ b/admin-web/src/views/systemSetting/department/index.vue
@@ -138,7 +138,7 @@
             align: 'center',
             width: 100,
             formatter: (row) => {
-              return { value: row.status === 0 ? '鍚敤' : '绂佺敤' };
+              return { value: row.status === 1 ? '鍚敤' : '绂佺敤' };
             },
           },
         ],
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
index 9440d01..3930667 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
@@ -1,5 +1,14 @@
 package com.consum.base.controller;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.consum.base.BaseController;
 import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.pojo.FinSysTenantDepartmentParam;
@@ -9,14 +18,11 @@
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * @Description 閮ㄩ棬绠$悊
@@ -38,8 +44,7 @@
      */
     @ApiOperation(value = "鏂板", notes = "鏂板")
     @ApiImplicitParams(value = {
-        @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")
-    })
+        @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")})
     @PostMapping("/add")
     public ResponseValue add() {
         FinSysTenantDepartmentParam param = CommonUtil.getObjFromReqBody(FinSysTenantDepartmentParam.class);
@@ -53,12 +58,14 @@
         if (StringUtils.isEmpty(param.getCode())) {
             return ResponseValue.error("缂栧彿涓虹┖");
         }
-        FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode(),param.getId());
+        FinSysTenantDepartment tenantDepartment =
+            departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode());
         if (tenantDepartment != null) {
             return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
         }
-        //鍒ゆ柇鍚屼竴鏈烘瀯id涓� 閮ㄩ棬鍚嶇О 鏄惁閲嶅
-        FinSysTenantDepartment department = this.departmentService.getByNameAndTenantId(param.getName(), param.getTenantId());
+        // 鍒ゆ柇鍚屼竴鏈烘瀯id涓� 閮ㄩ棬鍚嶇О 鏄惁閲嶅
+        FinSysTenantDepartment department =
+            departmentService.getTenantDepartment(param.getName(), param.getTenantId(), null);
         if (department != null) {
             return ResponseValue.error("閮ㄩ棬鍚嶇О宸插瓨鍦�");
         }
@@ -75,7 +82,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/26
      */
-    //濡傛灉涓嶄紶鏈烘瀯id锛岄粯璁ゆ煡鐪佺骇鏈烘瀯鐨勯儴闂�
+    // 濡傛灉涓嶄紶鏈烘瀯id锛岄粯璁ゆ煡鐪佺骇鏈烘瀯鐨勯儴闂�
     @GetMapping("/list")
     public ResponseValue queryList() {
         FinSysTenantDepartmentParam param = CommonUtil.getObjFromReq(FinSysTenantDepartmentParam.class);
@@ -91,11 +98,9 @@
         return ResponseValue.success(pager);
     }
 
-
     @ApiOperation(value = "鏍规嵁鏈烘瀯id鏌ヨ鎵�鏈夐儴闂ㄥ垪琛ㄤ俊鎭�", notes = "鏍规嵁鏈烘瀯id鏌ヨ鎵�鏈夐儴闂ㄥ垪琛ㄤ俊鎭�")
     @ApiImplicitParams(value = {
-        @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")
-    })
+        @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")})
     @GetMapping("/list/all")
     public ResponseValue queryAllDepartment(Long tenantId) {
         FinSysTenantUser sysInfo = this.getSysInfo();
@@ -134,7 +139,8 @@
         if (sysInfo == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
-        FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode(),param.getId());
+        FinSysTenantDepartment tenantDepartment =
+            this.departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode());
         if (tenantDepartment != null) {
             return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
         }
@@ -184,6 +190,4 @@
         return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
     }
 
-
 }
-
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java
index c8be330..4e1e983 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java
@@ -1,16 +1,17 @@
 package com.consum.base.service;
 
+import java.util.List;
+
 import com.consum.base.pojo.FinSysTenantDepartmentParam;
 import com.consum.model.po.FinSysTenantDepartment;
 import com.consum.model.po.FinSysTenantUser;
 import com.walker.db.page.GenericPager;
 import com.walker.jdbc.service.BaseService;
-import java.util.List;
 
 public interface FinSysTenantDepartmentService extends BaseService {
 
 
-    FinSysTenantDepartment getByNameAndTenantId(String name, Long tenantId);
+    FinSysTenantDepartment getTenantDepartment(String name, Long tenantId, String code);
 
     /**
      * @Description 鏂板
@@ -25,8 +26,6 @@
      * @Date 2023/10/26
      */
     GenericPager<FinSysTenantDepartment> queryList(FinSysTenantDepartmentParam param);
-
-    FinSysTenantDepartment selectByCode(String code,Long id);
 
     /**
      * @Description 缂栬緫
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
index c1657c7..415b77a 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
@@ -1,5 +1,11 @@
 package com.consum.base.service.impl;
 
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
 import com.consum.base.Constants;
 import com.consum.base.core.utils.IdUtil;
 import com.consum.base.pojo.FinSysTenantDepartmentParam;
@@ -10,12 +16,6 @@
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * @Description 閮ㄩ棬绠$悊
@@ -33,20 +33,26 @@
      * @Date 2023/10/26
      */
     @Override
-    public FinSysTenantDepartment getByNameAndTenantId(String name, Long tenantId) {
+    public FinSysTenantDepartment getTenantDepartment(String name, Long tenantId, String code) {
         StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 ");
         HashMap<String, Object> paramts = new HashMap<>();
 
-        //閮ㄩ棬鍚嶇О
+        // 閮ㄩ棬鍚嶇О
         if (!StringUtils.isEmpty(name)) {
             sql.append(" and name =:name ");
             paramts.put("name", name);
         }
-        //鏈烘瀯id
+        // 鏈烘瀯id
         if (tenantId != null) {
             sql.append(" and TENANT_ID =:TENANT_ID ");
             paramts.put("TENANT_ID", tenantId);
         }
+        if (!StringUtils.isEmpty(code)) {
+            sql.append("and CODE = :code ");
+            paramts.put("code", code);
+        }
+
+        sql.append("and status = 1");
         return this.get(sql.toString(), paramts, new FinSysTenantDepartment());
     }
 
@@ -61,9 +67,9 @@
         BeanUtils.copyProperties(param, department);
         department.setId(IdUtil.generateId());
 
-        //鍒涘缓浜哄鍚�
+        // 鍒涘缓浜哄鍚�
         department.setCreateBy(sysInfo.getUserName());
-        //鍒涘缓鏃堕棿
+        // 鍒涘缓鏃堕棿
         department.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
 
         return this.insert(department);
@@ -79,22 +85,22 @@
         StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
         HashMap<String, Object> paramts = new HashMap<>();
 
-        //閮ㄩ棬鍚嶇О
+        // 閮ㄩ棬鍚嶇О
         if (!StringUtils.isEmpty(param.getName())) {
             sql.append(" and name like:name ");
             paramts.put("name", StringUtils.CHAR_PERCENT + param.getName() + StringUtils.CHAR_PERCENT);
         }
-        //缂栧彿
+        // 缂栧彿
         if (!StringUtils.isEmpty(param.getCode())) {
             sql.append(" and code like:code ");
             paramts.put("code", StringUtils.CHAR_PERCENT + param.getCode() + StringUtils.CHAR_PERCENT);
         }
-        //鐘舵��
+        // 鐘舵��
         if (param.getStatus() != null) {
             sql.append(" and status =:status ");
             paramts.put("status", param.getStatus());
         }
-        //鏈烘瀯id
+        // 鏈烘瀯id
         if (param.getTenantId() != null) {
             sql.append(" and TENANT_ID =:TENANT_ID ");
             paramts.put("TENANT_ID", param.getTenantId());
@@ -104,23 +110,6 @@
 
         sql.append(" ORDER BY ORDER_NUM,CREATE_TIME DESC ");
         return selectSplit(sql.toString(), paramts, new FinSysTenantDepartment());
-    }
-
-    @Override
-    public FinSysTenantDepartment selectByCode(String code, Long id) {
-        StringBuilder sql = new StringBuilder(QUERY_BY_CODE);
-        ArrayList<Object> param = new ArrayList<>(2);
-        param.add(code);
-        if (id != null) {
-            sql.append(" and id != ?");
-            param.add(id);
-        }
-        List<FinSysTenantDepartment> select = this.select(sql.toString(), param.toArray(), new FinSysTenantDepartment());
-        if (StringUtils.isEmptyList(select)) {
-            return null;
-        } else {
-            return select.get(0);
-        }
     }
 
     /**
@@ -156,9 +145,9 @@
     @Override
     public int updateById(FinSysTenantDepartment department, FinSysTenantUser currentUser) {
         department.setIsDelete(Constants.IS_DELETE_YES);
-        //鍒犻櫎鏃堕棿
+        // 鍒犻櫎鏃堕棿
         department.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        //鍒犻櫎浜哄鍚�
+        // 鍒犻櫎浜哄鍚�
         department.setUpdateBy(currentUser.getUserName());
         return this.update(department);
     }
@@ -174,7 +163,7 @@
         StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
         HashMap<String, Object> paramts = new HashMap<>();
 
-        //鏈烘瀯id
+        // 鏈烘瀯id
         if (agencyId != null) {
             sql.append(" and TENANT_ID =:TENANT_ID ");
             paramts.put("TENANT_ID", agencyId);

--
Gitblit v1.9.1