1、地址二级查询

2、用户名称唯一限制

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 公用用户信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-22
+ * @Date:   2025-08-07
  * @Version: V1.0
  */
 @Api(tags="公用用户信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -26,7 +26,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 公用用户信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-22
+ * @Date:   2025-08-07
  * @Version: V1.0
  */
 @Data

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 公用用户信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-22
+ * @Date:   2025-08-07
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 公用用户信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-22
+ * @Date:   2025-08-07
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 公用用户信息表
  * @Author: jeecg-boot
- * @Date:   2025-05-22
+ * @Date:   2025-08-07
  * @Version: V1.0
  */
 @Service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java

@@ -7,6 +7,8 @@ import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.JobService;
 import org.jeecg.modules.apiUtils.CommonUtils;
+import org.jeecg.modules.employAddress.entity.EmployAddress;
+import org.jeecg.modules.employAddress.service.IEmployAddressService;
 import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
 import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService;
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
@@ -19,6 +21,7 @@ import org.jeecg.modules.employCompany.entity.EmployCompany;
 import org.jeecg.modules.employCompany.service.IEmployCompanyService;
 import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employJob.service.IEmployJobService;
+import org.jeecg.modules.employResume.entity.EmployResume;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
@@ -65,6 +68,10 @@ public class JobServiceImpl implements JobService {
     @Resource
     private IEmployCompanyService employCompanyService;
 
+    //区域信息表
+    @Resource
+    private IEmployAddressService employAddressService;
+
     /******************************************************************************************************************/
 
 
@@ -86,8 +93,40 @@ public class JobServiceImpl implements JobService {
             //组装查询条件
             if(null != employJob.getAreaId()){
                 //工作地域
-                query.eq(EmployJob::getAreaId, employJob.getAreaId());
+                //query.eq(EmployJob::getAreaId, employJob.getAreaId());
+                List<String> list = getCategoryList(employJob.getAreaId());
+                if(list.size()>1){
+                    for (String s : list) {
+                        query.or(
+                                q -> q
+                                        .eq(EmployJob::getAreaId, s)
+                        );
+                    }
+                }else {
+                    query.like(EmployJob::getAreaId, employJob.getAreaId());
+                }
             }
+//            else {
+//                List<EmployAddress> addressList = employAddressService
+//                        .lambdaQuery()
+//                        .eq(EmployAddress::getPid, "0")
+//                        .list();
+//                StringBuffer areaIds = new StringBuffer("1");
+//                for (EmployAddress address : addressList) {
+//                    areaIds.append(","+address.getId());
+//                }
+//                List<String> list = getCategoryList(areaIds.toString());
+//                if(list.size()>1){
+//                    for (String s : list) {
+//                        query.or(
+//                                q -> q
+//                                        .like(EmployJob::getAreaId, s)
+//                        );
+//                    }
+//                }else {
+//                    query.like(EmployJob::getAreaId, employJob.getAreaId());
+//                }
+//            }
             if(null != employJob.getWorkAddress()){
                 //工作地址
                 query.like(EmployJob::getWorkAddress, employJob.getWorkAddress());
@@ -113,10 +152,13 @@ public class JobServiceImpl implements JobService {
                 query.like(EmployJob::getUserId, userId);
             }
 
-            //招聘截止时间
-            query.gt(EmployJob::getDeadline, CommonUtils.getCurrentTime())
+//            //招聘截止时间
+            query.and(
+                    q -> q
+                            .gt(EmployJob::getDeadline, CommonUtils.getCurrentTime())
                     .or()
-                    .isNull(EmployJob::getDeadline);
+                    .isNull(EmployJob::getDeadline)
+            );
 
             //按时间倒序
             query.orderByDesc(EmployJob::getCreateTime);
@@ -381,4 +423,32 @@ public class JobServiceImpl implements JobService {
         }
     }
 
+    //获取二级分类
+    public List<String> getCategoryList(String categoryId){
+        List<String> list = new ArrayList<>();
+
+        //如果地址多选，则只查询子地址；如果地址单选，查询是否有子级地址
+        String[] split = categoryId.split(",");
+        if(split.length > 1){
+            for (String s : split) {
+                list.add(s);
+            }
+        }else {
+            list.add(categoryId);
+            //查询分类是否有子集
+            EmployAddress address = employAddressService.getById(categoryId);
+            if(null != address && address.getHasChild().equals("1")){
+                List<EmployAddress> employAddressList = employAddressService
+                        .lambdaQuery()
+                        .eq(EmployAddress::getPid, categoryId)
+                        .list();
+                for (EmployAddress employAddress : employAddressList) {
+                    list.add(employAddress.getId());
+                }
+            }
+        }
+
+        return list;
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.JobService;
 import org.jeecg.modules.apiService.ResumeService;
 import org.jeecg.modules.employAddress.entity.EmployAddress;
 import org.jeecg.modules.employAddress.service.IEmployAddressService;
@@ -21,7 +22,9 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -82,7 +85,17 @@ public class ResumeServiceImpl implements ResumeService {
             }
             if(null != employResume.getExpectAddress()){
                 //期望工作地点
-                query.like(EmployResume::getExpectAddress, employResume.getExpectAddress());
+                List<String> list = getCategoryList(employResume.getExpectAddress());
+                if(list.size()>1){
+                    for (String s : list) {
+                        query.or(
+                                q -> q
+                                        .like(EmployResume::getExpectAddress, s)
+                        );
+                    }
+                }else {
+                    query.like(EmployResume::getExpectAddress, employResume.getExpectAddress());
+                }
             }
             if(null != employResume.getTitle()){
                 //简历名称
@@ -294,4 +307,33 @@ public class ResumeServiceImpl implements ResumeService {
             return Result.error(message);
         }
     }
+
+    //获取二级分类
+    public List<String> getCategoryList(String categoryId){
+        List<String> list = new ArrayList<>();
+
+        //如果地址多选，则只查询子地址；如果地址单选，查询是否有子级地址
+        String[] split = categoryId.split(",");
+        if(split.length > 1){
+            for (String s : split) {
+                list.add(s);
+            }
+        }else {
+            list.add(categoryId);
+            //查询分类是否有子集
+            EmployAddress address = employAddressService.getById(categoryId);
+            if(null != address && address.getHasChild().equals("1")){
+                List<EmployAddress> employAddressList = employAddressService
+                        .lambdaQuery()
+                        .eq(EmployAddress::getPid, categoryId)
+                        .list();
+                for (EmployAddress employAddress : employAddressList) {
+                    list.add(employAddress.getId());
+                }
+            }
+        }
+
+        return list;
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java

@@ -130,11 +130,22 @@ public class UserInfoServiceImpl implements UserInfoService {
     public Result<?> updateUserInfo(String token,String nickName,String phone,String headImage){
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
 
         try{
             //用户昵称不能为空
             if(StringUtils.isBlank(nickName)){
                 return Result.error("用户昵称不能为空");
+            }else {
+                //判断昵称是否重复
+                List<HanHaiMember> list = hanHaiMemberService
+                        .lambdaQuery()
+                        .eq(HanHaiMember::getNickName, nickName)
+                        .ne(HanHaiMember::getId,hanHaiMember.getId())
+                        .list();
+                if(list.size() > 0){
+                    return Result.error("昵称已经被使用");
+                }
             }
             if(StringUtils.isBlank(headImage)){
                 return Result.error("头像不能为空");