开SQL日志，修BUG

.run/digital-investment.run.xml

@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="digital-investment" type="docker-deploy" factoryName="dockerfile" singleton="false" server-name="172.16.118.14">
+  <configuration default="false" name="digital-investment" type="docker-deploy" factoryName="dockerfile" singleton="false" server-name="192.168.0.23">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="digital-investment" />
+        <option name="imageTag" value="digital-investment:4.8.0" />
         <option name="containerName" value="digital-investment" />
         <option name="envVars">
           <list>
@@ -12,7 +12,7 @@
             </DockerEnvVarImpl>
           </list>
         </option>
-        <option name="commandLineOptions" value="--network host" />
+        <option name="commandLineOptions" value="--network host --restart always" />
         <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
         <option name="volumeBindings">
           <list>

ruoyi-admin/src/main/resources/application.yml

@@ -164,7 +164,7 @@ mybatis-plus:
     # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
     # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
     # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
-    logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+    logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
 #  global-config:
 #    # 是否打印 Logo banner
 #    banner: true

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -363,23 +363,22 @@ public class EquipmentServiceImpl implements EquipmentService {
     @Override
     public HashMap getEquipmentList(EquipmentVo equipmentVo) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
-        if (ObjUtil.isNotNull(equipmentVo.getSearchText())) {
-            queryWrapper.likeRight("equipment_id", equipmentVo.getSearchText());
-            queryWrapper.or().like("equipment_name", equipmentVo.getSearchText());
-            queryWrapper.or().like("equipment_code", equipmentVo.getSearchText());
-            queryWrapper.or().like("maintain_name", equipmentVo.getSearchText());
-            queryWrapper.or().likeRight("maintain_telephone", equipmentVo.getSearchText());
-        }
 
         if (equipmentVo.getState() != null) {
-            queryWrapper.and(equipmentQueryWrapper -> {
-                equipmentQueryWrapper.eq("state", equipmentVo.getState());
-            });
+            queryWrapper.eq("state", equipmentVo.getState());
         }
 
         if (equipmentVo.getOnState() != null) {
-            queryWrapper.and(equipmentQueryWrapper -> {
-                equipmentQueryWrapper.eq("on_state", equipmentVo.getOnState());
+            queryWrapper.eq("on_state", equipmentVo.getOnState());
+        }
+
+        if (ObjUtil.isNotNull(equipmentVo.getSearchText())) {
+            queryWrapper.and(q -> {
+                q.likeRight("equipment_id", equipmentVo.getSearchText())
+                    .or().like("equipment_name", equipmentVo.getSearchText())
+                    .or().like("equipment_code", equipmentVo.getSearchText())
+                    .or().like("maintain_name", equipmentVo.getSearchText())
+                    .or().likeRight("maintain_telephone", equipmentVo.getSearchText());
             });
         }
         queryWrapper.orderByDesc("enter_time");
@@ -390,9 +389,7 @@ public class EquipmentServiceImpl implements EquipmentService {
         Page<Equipment> equipmentPage = equipmentMapper.selectPage(page, queryWrapper);
 
         //查询广告数
-        List<String> collect = equipmentPage.getRecords().stream().map(item -> {
-            return item.getEquipmentId();
-        }).collect(Collectors.toList());
+        List<String> collect = equipmentPage.getRecords().stream().map(Equipment::getEquipmentId).collect(Collectors.toList());
 
         HashMap<String, Integer> hashMap = new HashMap<>();
         List<EquipmentBo> result = new ArrayList<>();