Эх сурвалжийг харах

车辆管理搜索字段去除空格

donglang 2 сар өмнө
parent
commit
e6520eca41

+ 6 - 4
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -400,21 +400,23 @@ public class KwfTruckService {
             return counts;
         } else {
             Object keywords = params.get("keywords");
-            if (StringUtils.isNotBlank(keywords)) {
+            String newKeywords = keywords == null ? null : StringUtils.objectStr(keywords).trim();
+            if (StringUtils.isNotBlank(newKeywords)) {
                 //查询企业
                 List<Integer> entTypes = new ArrayList<>() {{
                     add(EntTypeEnum.LOGISTICS3.getCode());
                     add(EntTypeEnum.LOGISTICS4.getCode());
                 }};
-                List<Long> entIds = remoteUserService.findEntIds(entTypes, StringUtils.objectStr(keywords));
+                List<Long> entIds = remoteUserService.findEntIds(entTypes,newKeywords);
                 params.put("entIds", entIds);
                 //查询用户
                 List<Long> userIds = remoteUserService.findUserIds(new ArrayList<>() {{
                     add(LoginUserHolder.getEntId());
-                }}, StringUtils.objectStr(keywords));
+                }}, newKeywords);
                 params.put("createBys", userIds);
             }
             params.put("entId", LoginUserHolder.getEntId());
+            params.put("keywords", newKeywords);
             List<KwfTruckVo> counts = truckDao.findPage(params);
             return counts;
         }
@@ -493,7 +495,7 @@ public class KwfTruckService {
             truckLicenseEdit(truckLicenseDto);
         }
 
-        /**车辆行驶证信息**/
+        /**车辆道路运输许可证**/
         KwfTransportLicenseDto transportLicenseDto = params.getTransportLicense();
         if (transportLicenseDto != null) {
             transportLicenseDto.setTruckId(truck.getId());