1、到期工作岗位隐藏修复

2、问题与反馈模块修复
3、简历期望工作地显示修复

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employFeedback/controller/EmployFeedbackController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 意见反馈表
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 @Api(tags="意见反馈表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employFeedback/entity/EmployFeedback.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 意见反馈表
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 @Data
@@ -50,9 +50,22 @@ public class EmployFeedback implements Serializable {
 	/**反馈内容*/
 	@Excel(name = "反馈内容", width = 15)
     @ApiModelProperty(value = "反馈内容")
-    private java.lang.String content;
+    private java.lang.String question;
+	/**联系方式*/
+	@Excel(name = "联系方式", width = 15)
+    @ApiModelProperty(value = "联系方式")
+    private java.lang.String phone;
+	/**联系姓名*/
+	@Excel(name = "联系姓名", width = 15)
+    @ApiModelProperty(value = "联系姓名")
+    private java.lang.String name;
+	/**图片*/
+	@Excel(name = "图片", width = 15)
+    @ApiModelProperty(value = "图片")
+    private java.lang.String image;
 	/**关联用户id*/
-	@Excel(name = "关联用户id", width = 15)
+	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employFeedback/mapper/EmployFeedbackMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 意见反馈表
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 public interface EmployFeedbackMapper extends BaseMapper<EmployFeedback> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employFeedback/service/IEmployFeedbackService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 意见反馈表
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 public interface IEmployFeedbackService extends IService<EmployFeedback> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employFeedback/service/impl/EmployFeedbackServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 意见反馈表
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employFeedback/vue/EmployFeedbackList.vue

@@ -4,6 +4,21 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="关联用户id">
+              <j-dict-select-tag placeholder="请选择关联用户id" v-model="queryParam.userId" dictCode="han_hai_member,nick_name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -125,13 +140,29 @@
           {
             title:'反馈内容',
             align:"center",
-            dataIndex: 'content',
+            dataIndex: 'question',
             scopedSlots: {customRender: 'htmlSlot'}
           },
+          {
+            title:'联系方式',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'联系姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
           {
             title:'关联用户id',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title: '操作',
@@ -167,7 +198,10 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'content',text:'反馈内容',dictCode:''})
+        fieldList.push({type:'Text',value:'question',text:'反馈内容',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'联系姓名',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employFeedback/vue/modules/EmployFeedbackForm.vue

@@ -4,13 +4,28 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="反馈内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="content">
-              <j-editor v-model="model.content" />
+            <a-form-model-item label="反馈内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="question">
+              <j-editor v-model="model.question" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系方式"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入联系姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入关联用户id"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -50,6 +65,10 @@
         },
         confirmLoading: false,
         validatorRules: {
+           name: [
+              { required: false},
+              { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+           ],
         },
         url: {
           add: "/employFeedback/employFeedback/add",

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employFeedback/vue3/EmployFeedback.data.ts

@@ -7,28 +7,79 @@ export const columns: BasicColumn[] = [
     {
     title: '反馈内容',
     align:"center",
-    dataIndex: 'content',
+    dataIndex: 'question',
     slots: { customRender: 'htmlSlot' },
    },
+   {
+    title: '联系方式',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '联系姓名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '图片',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
+   },
    {
     title: '关联用户id',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "关联用户id",
+      field: "userId",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"han_hai_member,nick_name,id"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
   {
     label: '反馈内容',
-    field: 'content',
+    field: 'question',
     component: 'JCodeEditor', //TODO String后缀暂未添加
   },
+  {
+    label: '联系方式',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '联系姓名',
+    field: 'name',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: false},
+                 { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+          ];
+     },
+  },
+  {
+    label: '图片',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
   {
     label: '关联用户id',
     field: 'userId',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/controller/EmployMaterialController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 报名材料信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-05
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 @Api(tags="报名材料信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/entity/EmployMaterial.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 报名材料信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-05
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 @Data
@@ -72,4 +72,9 @@ public class EmployMaterial implements Serializable {
 	@Excel(name = "资料下载模板", width = 15)
     @ApiModelProperty(value = "资料下载模板")
     private java.lang.String template;
+	/**是否必填*/
+	@Excel(name = "是否必填", width = 15, dicCode = "is_fill")
+	@Dict(dicCode = "is_fill")
+    @ApiModelProperty(value = "是否必填")
+    private java.lang.String isFill;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/mapper/EmployMaterialMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 报名材料信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-05
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 public interface EmployMaterialMapper extends BaseMapper<EmployMaterial> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/service/IEmployMaterialService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 报名材料信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-05
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 public interface IEmployMaterialService extends IService<EmployMaterial> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/service/impl/EmployMaterialServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 报名材料信息表
  * @Author: jeecg-boot
- * @Date:   2025-08-05
+ * @Date:   2025-08-11
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/vue/EmployMaterialList.vue

@@ -169,6 +169,11 @@
             dataIndex: 'template',
             scopedSlots: {customRender: 'fileSlot'}
           },
+          {
+            title:'是否必填',
+            align:"center",
+            dataIndex: 'isFill_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -209,6 +214,7 @@
         fieldList.push({type:'string',value:'keyName',text:'对应材料名称',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'材料底图',dictCode:''})
         fieldList.push({type:'Text',value:'template',text:'资料下载模板',dictCode:''})
+        fieldList.push({type:'string',value:'isFill',text:'是否必填',dictCode:'is_fill'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/vue/modules/EmployMaterialForm.vue

@@ -33,6 +33,11 @@
               <j-upload v-model="model.template"   ></j-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否必填" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isFill">
+              <j-dict-select-tag type="list" v-model="model.isFill" dictCode="is_fill" placeholder="请选择是否必填" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/vue3/EmployMaterial.data.ts

@@ -36,6 +36,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'template',
     slots: { customRender: 'fileSlot' },
    },
+   {
+    title: '是否必填',
+    align:"center",
+    dataIndex: 'isFill_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -85,4 +90,12 @@ export const formSchema: FormSchema[] = [
     componentProps:{
      },
   },
+  {
+    label: '是否必填',
+    field: 'isFill',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_fill"
+     },
+  },
 ];

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

@@ -95,16 +95,7 @@ public class JobServiceImpl implements JobService {
                 //工作地域
                 //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());
-                }
+                query.in(EmployJob::getAreaId, list);
             }
 //            else {
 //                List<EmployAddress> addressList = employAddressService
@@ -434,7 +425,6 @@ public class JobServiceImpl implements JobService {
                 list.add(s);
             }
         }else {
-            list.add(categoryId);
             //查询分类是否有子集
             EmployAddress address = employAddressService.getById(categoryId);
             if(null != address && address.getHasChild().equals("1")){
@@ -445,6 +435,8 @@ public class JobServiceImpl implements JobService {
                 for (EmployAddress employAddress : employAddressList) {
                     list.add(employAddress.getId());
                 }
+            }else {
+                list.add(categoryId);
             }
         }
 

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

@@ -144,6 +144,8 @@ public class ResumeServiceImpl implements ResumeService {
     public Result<?> queryResumeById(String token, String resumeId) {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+
         //返回信息
         Map<String, Object> map = new HashMap<>();
 
@@ -152,9 +154,20 @@ public class ResumeServiceImpl implements ResumeService {
             EmployResume resume = employResumeService.getById(resumeId);
             map.put("resume", resume);
 
-//            //简历期望工作地
-//            EmployAddress address = employAddressService.getById(resume.getExpectAddress());
-//            resume.setExpectAddressName(address.getAdress());
+            //简历期望工作地
+            String[] split = resume.getExpectAddress().split(",");
+            StringBuffer buffer = new StringBuffer("");
+            int index = 1;
+            for (String s : split) {
+                EmployAddress address = employAddressService.getById(s);
+                if(1 == index){
+                    buffer.append(address.getAdress());
+                }else {
+                    buffer.append(","+address.getAdress());
+                }
+                index++;
+            }
+            resume.setExpectAddressName(buffer.toString());
 
             //2、获取个人实名认证信息
             EmployAuthenticationPerson person = employAuthenticationPersonService
@@ -289,6 +302,7 @@ public class ResumeServiceImpl implements ResumeService {
 
         try{
             //执行简历信息修改
+            employResume.setUserId(hanHaiMember.getId());
             result = employResumeService.updateById(employResume);
 
             //判断执行结果