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 - AND pro_name like('%',#{projectName},'%') + AND pro_name like concat('%',#{projectName},'%') 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 @@ - 当月 + INSERT INTO tb_pro_bd id,