From d175fbe30af4c61f3f1e76757e94b0a981d33c9e Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 2 Jul 2024 10:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96BUG=20=E4=BB=8E=E4=B8=9A?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9=E5=B7=B2=E6=9C=89=E4=BA=BA?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/beidou/BeidouController.java | 1 + .../operatingvehicles/OperatingVehiclesController.java | 1 + .../controller/system/AppVersionManagerController.java | 4 ++++ .../com/zcloud/service/system/impl/UsersServiceImpl.java | 2 +- .../mybatis/datasource/check/CheckRecordMapper.xml | 9 ++------- .../datasource/freighttrailer/FreightTrailerMapper.xml | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zcloud/controller/beidou/BeidouController.java b/src/main/java/com/zcloud/controller/beidou/BeidouController.java index d33a155..3a6e4ed 100644 --- a/src/main/java/com/zcloud/controller/beidou/BeidouController.java +++ b/src/main/java/com/zcloud/controller/beidou/BeidouController.java @@ -319,6 +319,7 @@ public class BeidouController extends BaseController { if (!StringUtils.isEmpty(pd.getString("TRAFFIC_TYPE")) && pd.getString("TRAFFIC_TYPE").equals("1")) { // 营运车辆 List operatingList = operatingVehiclesService.operationVehicleList(pd.getString("CORPINFO_ID")); + operatingList = operatingList.stream().filter(data -> StringUtils.equals(data.getString("ISASSIGNED"), "0")).collect(Collectors.toList()); page.setPd(pd); List compassList = beidouService.list(page); diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index eb3ad5a..7e66e93 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -30,6 +30,7 @@ import org.springframework.web.servlet.ModelAndView; import java.io.File; import java.util.*; +import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/src/main/java/com/zcloud/controller/system/AppVersionManagerController.java b/src/main/java/com/zcloud/controller/system/AppVersionManagerController.java index 1d25abe..3d8aa68 100644 --- a/src/main/java/com/zcloud/controller/system/AppVersionManagerController.java +++ b/src/main/java/com/zcloud/controller/system/AppVersionManagerController.java @@ -6,6 +6,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.system.VersionManagerService; import com.zcloud.util.*; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -164,6 +165,9 @@ public class AppVersionManagerController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); List varList = versionmanagerService.listAll(pd); //列出VersionManager列表 + if(CollectionUtils.isEmpty(varList)) { + varList.add(new PageData()); + } map.put("pd", varList.get(0)); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index c85fcdd..f7a5e96 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -1349,7 +1349,7 @@ public class UsersServiceImpl implements UsersService { try { FaceUtil.compareFace(pd.getString("USERAVATARURL"), pd.getString("USERAVATARURL")); } catch (Exception e) { - throw new Exception("人脸图像不符合要求，请重新上传"); + return ReturnMap.ok("1"); } } /*if (!IdcardUtils.validateCard(pd.getString("USER_ID_CARD"))) { diff --git a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml index 71072c1..dd16ce5 100644 --- a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml @@ -210,7 +210,6 @@ order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc