From cd1e038272dfd9b67b72c5338f521d4a6365d737 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 2 Apr 2024 09:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/securitycontrol/auth/VscAuthApplication.java | 3 ++-
 .../src/main/resources/mapper/BdMapper.xml                     | 2 +-
 .../background/service/impl/HumanServiceImpl.java              | 2 +-
 .../src/main/resources/mapper/DeviceBdMapper.xml               | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/VscAuthApplication.java b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/VscAuthApplication.java
index 2d94175..9bb021c 100644
--- a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/VscAuthApplication.java
+++ b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/VscAuthApplication.java
@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import com.securitycontrol.common.security.annotation.EnableRyFeignClients;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 
 /**
  * 认证授权中心
@@ -11,7 +12,7 @@ import com.securitycontrol.common.security.annotation.EnableRyFeignClients;
  * @author czc
  */
 @EnableRyFeignClients
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,MongoAutoConfiguration.class })
 public class VscAuthApplication
 {
     public static void main(String[] args)
diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml b/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml
index ae6502b..a632e9c 100644
--- a/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml
+++ b/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml
@@ -28,7 +28,7 @@
             left join sys_build sb on sb.org_id=tjp.org_id
             <where>
                 <if test="projectName!=null and projectName!=''">
-                     AND pro_name like('%',#{projectName},'%')
+                     AND pro_name like concat('%',#{projectName},'%')
                 </if>
             </where>
     </select>
diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java
index 8ca617d..3b2edc4 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java
@@ -308,7 +308,7 @@ public class HumanServiceImpl implements HumanService {
     public AjaxResult delBind(ParamDto dto) {
         try{
             if (StringHelper.isEmpty(dto.getUserId())) {
-                AjaxResult.error("人员不能为空");
+                return  AjaxResult.error("人员不能为空");
             }
             int num= mapper.delBind(dto);
             if(num>SystemGlobal.MIN_NUM){
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
index 59c902b..1e3f67c 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.securitycontrol.background.mapper.IDeviceOfBdMapper">
     <!--新增/修改边带-->
     <insert id="addOrUpdateDeviceBd">
-        当月
+        <if test="type == 1">
             INSERT INTO tb_pro_bd
             <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null and id != ''">id,</if>