通讯录查询新增模糊查询接口,用户登录返回行政区划权限标识
parent
46b51d2885
commit
c541b1f5e3
|
|
@ -28,5 +28,8 @@ public class AddressBootDto extends CommDto{
|
|||
@ApiModelProperty(value = "登录用户id")
|
||||
private String userId;
|
||||
|
||||
@ApiModelProperty(value = "搜索框模糊查询")
|
||||
private String allLikeStr;
|
||||
|
||||
private String v;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,6 +82,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> 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<UserMapper, User> 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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,15 @@
|
|||
<if test="dto.phone != null and dto.phone != '' ">
|
||||
AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%')
|
||||
</if>
|
||||
<if test="dto.allLikeStr != null and dto.allLikeStr != '' ">
|
||||
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}, '%')
|
||||
)
|
||||
</if>
|
||||
ORDER BY F.SORT NULLS LAST,F.SORT,AB.SORT
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue