修改接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -116,6 +116,7 @@ public class FirefightersController extends BaseController {
     public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id) {
         QueryWrapper<FirefightersJacket> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("firefighters_id", id);
+        queryWrapper.eq("is_delete", 0);
         List<FirefightersJacket> firefightersJacket = iFirefightersJacketService.list(queryWrapper);
         if (firefightersJacket != null) {
             throw new RuntimeException("该消防还有在装装备！");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersJacketController.java

@@ -140,8 +140,16 @@ public class FirefightersJacketController extends BaseController {
                         Long fileValue = (Long) field.get(firefightersJacket);
                         firefightersJacketQueryWrapper.eq(name, fileValue);
                     } else if (type.equals(String.class)) {
-                        String fileValue = (String) field.get(firefightersJacket);
-                        firefightersJacketQueryWrapper.eq(name, fileValue);
+
+                        if("equipment_detail_name".equals(name)){
+                            String fileValue = (String) field.get(firefightersJacket);
+                            firefightersJacketQueryWrapper.like(name, fileValue);
+                        }else {
+                            String fileValue = (String) field.get(firefightersJacket);
+                            firefightersJacketQueryWrapper.eq(name, fileValue);
+                        }
+
+
                     } else if (type.equals(Date.class)) {
                         Date fileValue = (Date) field.get(firefightersJacket);
                         firefightersJacketQueryWrapper.eq(name, fileValue);