diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java index b7df7c0..48af1ac 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java @@ -67,6 +67,8 @@ public interface AppUserMapper AppUser selectAppUserByPhone(@Param("phoneNumber") String phoneNumber); List selectList(AppUser appUser); + List selectListByName(AppUser appUser); + List listByOrderTime(); void updateAppUserById(); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java index 301cceb..0177d70 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java @@ -172,6 +172,9 @@ public class AppRegisterServiceImpl implements IAppRegisterService { appUser.setProvinceId(appRegister.getProvinceId() != null ? appRegister.getProvinceId() : null); appUser.setCityId(appRegister.getCityId() != null ? appRegister.getCityId() : null); appUser.setTownId(appRegister.getTownId() != null ? appRegister.getTownId() : null); + appUser.setJx("[]"); + appUser.setHy("[]"); + appUser.setJy("[]"); appUserMapper.insertAppUser(appUser); if (org.apache.commons.lang3.StringUtils.isNotBlank(appRegister.getInvitationCode())) { AppCode appCode = appCodeMapper.selectAppCodeByCode(appRegister.getInvitationCode()); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java index 640e828..e91b1e8 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java @@ -279,7 +279,15 @@ public class AppUserServiceImpl implements IAppUserService { entity.setSchool(appUser.getSchool()); entity.setSearch(appUser.getSearch()); // 学校 - List schoolList = appUserMapper.selectList(entity); + List schoolList = new ArrayList<>(); + if (StringUtils.isBlank(appUser.getSearch())) { + schoolList = appUserMapper.selectList(entity); + } + if (StringUtils.isNotBlank(appUser.getSearch())) { + AppUser user = new AppUser(); + user.setSearch(appUser.getSearch()); + schoolList = appUserMapper.selectListByName(user); + } Collections.shuffle(schoolList); if (schoolList.size() > limit) { schoolList = schoolList.subList(0, limit); diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml index 5d14f16..495fa9f 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml @@ -236,6 +236,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by a.id + +