From 5134b351935e8906ef02f7beb2f5b06bf0e0bfc9 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 19 Sep 2024 13:16:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/TbBdDeviceRecordController.java |  1 -
 .../base/controller/TbWarnConfigController.java     |  2 +-
 .../java/com/bonus/base/mapper/TbTeamMapper.java    |  7 +++++++
 .../base/service/impl/TbProDepartServiceImpl.java   |  2 +-
 .../bonus/base/service/impl/TbTeamServiceImpl.java  | 13 +++++++++++++
 .../resources/mapper/base/TbProDepartMapper.xml     |  5 +----
 .../src/main/resources/mapper/base/TbTeamMapper.xml |  8 ++++++++
 7 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java
index c7659c3..106646f 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java
@@ -43,7 +43,6 @@ public class TbBdDeviceRecordController extends BaseController {
      */
     @GetMapping("/list")
     public AjaxResult queryByPage(TbBdDeviceRecord record) {
-        startPage();
         List<TbBdDeviceRecord> list = tbBdDeviceRecordService.getAll(record);
         return AjaxResult.success(list);
     }
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbWarnConfigController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbWarnConfigController.java
index 9f2977b..4b2b9bf 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbWarnConfigController.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbWarnConfigController.java
@@ -42,7 +42,7 @@ public class TbWarnConfigController extends BaseController {
      */
     @GetMapping("/list")
     public AjaxResult queryByPage(TbWarnConfig tbWarnConfig) {
-        if (tbWarnConfig.getIsAll() != null && tbWarnConfig.getIsAll() == 1) {
+        if (tbWarnConfig.getIsAll() != null && tbWarnConfig.getIsAll() == 0) {
             return AjaxResult.success(tbWarnConfigService.getAll(tbWarnConfig));
         }
         startPage();
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java
index 46e4a6a..c285198 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java
@@ -115,5 +115,12 @@ public interface TbTeamMapper {
      * @return
      */
     List<TbPeople> selectList(Long id);
+
+    /**
+     * 根据名称查询
+     * @param tbTeam
+     * @return
+     */
+    TbTeam selectByName(TbTeam tbTeam);
 }
 
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java
index a139198..2555bd1 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java
@@ -86,7 +86,7 @@ public class TbProDepartServiceImpl implements TbProDepartService {
         if (tbProDepart == null) {
             return AjaxResult.error(ExceptionEnum.TO_PARAM_NULL.getCode(), ExceptionEnum.TO_PARAM_NULL.getMsg());
         }
-        //名称重复性校验，一个地区内不能重复
+        //名称重复性校验
         TbProDepart depart = tbProDepartDao.selectByName(tbProDepart);
         if (depart != null) {
             return AjaxResult.error(ExceptionEnum.NAME_DUPLICATE.getCode(), ExceptionEnum.NAME_DUPLICATE.getMsg());
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java
index 7fc01f3..e7fbf02 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java
@@ -23,6 +23,7 @@ import javax.annotation.Resource;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 班组管理(TbTeam)表服务实现类
@@ -109,6 +110,11 @@ public class TbTeamServiceImpl implements TbTeamService {
         if (tbTeam == null) {
             return AjaxResult.error(ExceptionEnum.TO_PARAM_NULL.getCode(), ExceptionEnum.TO_PARAM_NULL.getMsg());
         }
+        // 名称重复性校验
+        TbTeam team = tbTeamDao.selectByName(tbTeam);
+        if (team != null) {
+            return AjaxResult.error(ExceptionEnum.NAME_DUPLICATE.getCode(), ExceptionEnum.NAME_DUPLICATE.getMsg());
+        }
         int result = 0;
         //单纯添加班组成员
         if (tbTeam.getId() != null && CollectionUtils.isNotEmpty(tbTeam.getIdList())) {
@@ -147,6 +153,13 @@ public class TbTeamServiceImpl implements TbTeamService {
         if (tbTeam == null || tbTeam.getId() == null) {
             return AjaxResult.error(ExceptionEnum.TO_PARAM_NULL.getCode(), ExceptionEnum.TO_PARAM_NULL.getMsg());
         }
+        // 名称重复性校验
+        TbTeam team = tbTeamDao.selectByName(tbTeam);
+        if (team != null) {
+            if (!Objects.equals(tbTeam.getId(), tbTeam.getId())) {
+                return AjaxResult.error(ExceptionEnum.NAME_DUPLICATE.getCode(), ExceptionEnum.NAME_DUPLICATE.getMsg());
+            }
+        }
         int result = 0;
         //修改时可能重新添加表单，根据id先将tb_people表中team_id字段置为null
         result += tbTeamDao.updatePeople(tbTeam.getId());
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml
index 6133675..b7c2c2d 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml
@@ -79,12 +79,9 @@
          update_time as updateTime, update_user as updateUser, del_flag as delFlag
         from tb_pro_depart
         where del_flag = '0'
-          <if test="departName != null and departName != ''">
+        <if test="departName != null and departName != ''">
             and depart_name = #{departName}
         </if>
-          <if test="areaId != null and areaId != ''">
-            and area_id = #{areaId}
-        </if>
     </select>
 
     <!--新增所有列-->
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml
index 403118c..4fe9198 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml
@@ -119,6 +119,14 @@
           AND tt.id = #{id}
     </select>
 
+    <select id="selectByName" resultType="com.bonus.base.domain.TbTeam">
+        select id, team_name, rel_id, rel_name, rel_phone, pro_id, pro_name, create_time, create_user, update_time,
+        js_time, update_user, del_flag from tb_team
+        where
+        del_flag = '0' and
+        team_name = #{teamName}
+    </select>
+
     <!--新增所有列-->
     <insert id="insert" keyProperty="teamId" useGeneratedKeys="true">
         INSERT INTO tb_team