开发地图设计器布局

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 {
 
@@ -70,5 +70,4 @@ public class MapLogistic extends CommonEntity {
     @ApiModelProperty("关联报告单生成的批次码")
     private String batchCode;
 
-
 }

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<User>()
                 .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());
     }