|
@@ -497,18 +497,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
public Result listFarmer(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
|
String pageNum = paramsMap.get("pageNum");
|
|
|
String pageSize = paramsMap.get("pageSize");
|
|
|
+ String code = paramsMap.get("code");
|
|
|
String accoutType = paramsMap.get("accoutType");
|
|
|
String farmType = paramsMap.get("farmType");
|
|
|
- String veterId = paramsMap.get("veterId");
|
|
|
SysUser sysUser = this.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
Integer userType = sysUser.getUserType();
|
|
|
|
|
|
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq(!StringUtils.isBlank(accoutType),"accout_type",accoutType)
|
|
|
- .eq(!StringUtils.isBlank(farmType),"farm_type",farmType)
|
|
|
- .eq(!StringUtils.isBlank(veterId),"veter_id",veterId);
|
|
|
+ .eq(!StringUtils.isBlank(farmType),"farm_type",farmType);
|
|
|
if (userType == 0){
|
|
|
- queryWrapper.eq("user_type",3);
|
|
|
+ queryWrapper.eq("user_type",3)
|
|
|
+ .like("detailed_adress_code",code);
|
|
|
}else {
|
|
|
queryWrapper.eq("user_type",3)
|
|
|
.like("detailed_adress_code",sysUser.getBriefAddressCode());
|