From c541b1f5e38250b4bc42c99523b8d462cc09a229 Mon Sep 17 00:00:00 2001 From: Xusan <1105644308@QQ.COM> Date: Mon, 20 May 2024 11:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3,=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/whdc/model/dto/AddressBootDto.java | 3 +++ src/main/java/com/whdc/model/vo/LoginVo.java | 4 ++++ .../whdc/service/impl/UserServiceImpl.java | 19 +++++++++++++++++++ .../resources/mapper/AddressBookMapper.xml | 9 +++++++++ 4 files changed, 35 insertions(+) diff --git a/src/main/java/com/whdc/model/dto/AddressBootDto.java b/src/main/java/com/whdc/model/dto/AddressBootDto.java index e9c46bf..862a3f3 100644 --- a/src/main/java/com/whdc/model/dto/AddressBootDto.java +++ b/src/main/java/com/whdc/model/dto/AddressBootDto.java @@ -28,5 +28,8 @@ public class AddressBootDto extends CommDto{ @ApiModelProperty(value = "登录用户id") private String userId; + @ApiModelProperty(value = "搜索框模糊查询") + private String allLikeStr; + private String v; } diff --git a/src/main/java/com/whdc/model/vo/LoginVo.java b/src/main/java/com/whdc/model/vo/LoginVo.java index 2d7850f..6b6dcff 100644 --- a/src/main/java/com/whdc/model/vo/LoginVo.java +++ b/src/main/java/com/whdc/model/vo/LoginVo.java @@ -36,4 +36,8 @@ public class LoginVo implements Serializable { @ApiModelProperty(value = "角色") private String role; + + + @ApiModelProperty(value = "行政区划级别 0省,1市,2县,3镇,4村,5组 ,(点击树查询下级, 点击查询按钮查询本级)", example = "0") + private Integer adlevel; } diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java index 45b0ea2..9b26a63 100644 --- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java @@ -82,6 +82,15 @@ public class UserServiceImpl extends ServiceImpl implements IU AddressBook book = addressBookMapper.selectById(sysUser.getAbId()); if (Objects.nonNull(book)){ + String adcd = book.getAdcd(); + if (StringUtils.isNotBlank(adcd)) { + if ("00000000000".equals(adcd.substring(4))) { // 市 + out.setAdlevel(1); + + } else if ("000000000".equals(adcd.substring(6))) { // 县 + out.setAdlevel(2); + } + } out.setName(book.getName()); } return out; @@ -184,6 +193,16 @@ public class UserServiceImpl extends ServiceImpl implements IU LoginVo out = new LoginVo(); BeanUtils.copyProperties(sysUser, out); + String adcd = addressBook.getAdcd(); + if (StringUtils.isNotBlank(adcd)) { + if ("00000000000".equals(adcd.substring(4))) { // 市 + out.setAdlevel(1); + + } else if ("000000000".equals(adcd.substring(6))) { // 县 + out.setAdlevel(2); + } + } + out.setName(addressBook.getName()); return out; } diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml index 24fc0da..1845787 100644 --- a/src/main/resources/mapper/AddressBookMapper.xml +++ b/src/main/resources/mapper/AddressBookMapper.xml @@ -33,6 +33,15 @@ AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%') + + AND ( + AB.NAME LIKE CONCAT('', #{dto.allLikeStr}, '%') + OR AB.PHONE LIKE CONCAT('', #{dto.allLikeStr}, '%') + OR O.NAME LIKE CONCAT('', #{dto.allLikeStr}, '%') + OR UD.NAME LIKE CONCAT('', #{dto.allLikeStr}, '%') + OR A.ADNM LIKE CONCAT('', #{dto.allLikeStr}, '%') + ) + ORDER BY F.SORT NULLS LAST,F.SORT,AB.SORT