From 9fff5237457a7da75736f2b835386476c8b4ef0b Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 25 Aug 2022 05:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=9C=B0=E5=9B=BE=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cloud/kicc/commonbiz/api/entity/MapLogistic.java | 5 ++--- .../com/cloud/kicc/system/controller/UserController.java | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java index c67e78d8..5f13a5c0 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java @@ -22,7 +22,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TableName("common_map") +@TableName(value = "common_map", excludeProperty = { "delFlag" }) @ApiModel(value = "Map对象", description = "地图核心主任务表") public class MapLogistic extends CommonEntity { @@ -43,7 +43,7 @@ public class MapLogistic extends CommonEntity { @ApiModelProperty("收样员起点经度值") private BigDecimal courierLng; - @ApiModelProperty("收样员起点纬度值 ") + @ApiModelProperty("收样员起点纬度值") private BigDecimal courierLat; @ApiModelProperty("发单下级医院ID") @@ -70,5 +70,4 @@ public class MapLogistic extends CommonEntity { @ApiModelProperty("关联报告单生成的批次码") private String batchCode; - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java index cb85b6ba..d6010bef 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java @@ -57,6 +57,7 @@ public class UserController { return new LambdaQueryWrapper() .like(StrUtil.isNotBlank(user.getUserName()), User::getUserName, user.getUserName()) .eq(StrUtil.isNotBlank(user.getDeptId()), User::getDeptId, user.getDeptId()) + .eq(StrUtil.isNotBlank(user.getUserType()), User::getUserType, user.getUserType()) .between(StrUtil.isNotBlank(user.getBeginTime()) && StrUtil.isNotBlank(user.getEndTime()), User::getCreateTime, user.getBeginTime(), user.getEndTime()); }