修改

common/src/main/resources/mapper/base/JobInformationInfo.xml

@@ -137,6 +137,9 @@
 			<if test="searchParams.serviceDesc != null">
 				and a.service_desc like #{searchParams.serviceDesc}
 			</if>
+			<if test="searchParams.content != null">
+				and ( a.service_desc like #{searchParams.content} or a.Intended_position like #{searchParams.content})
+			</if>
 			<if test="searchParams.method != null">
 				and a.method_ = #{searchParams.method}
 			</if>

common/src/main/resources/mapper/base/RecruitInformationInfo.xml

@@ -154,6 +154,9 @@
 			<if test="searchParams.positionName != null">
 				and a.position_name like #{searchParams.positionName}
 			</if>
+			<if test="searchParams.content != null">
+				and (a.position_name like #{searchParams.content} or a.desc like #{searchParams.content})
+			</if>
 			<if test="searchParams.salaryStart != null">
 				<![CDATA[
 				and a.salary_ >= #{searchParams.salaryStart}

web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java

@@ -60,6 +60,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/mobile/user/getVerifyCode")
 				.excludePathPatterns("/mobile/recruit/**")
 				.excludePathPatterns("/mobile/news/**")
+				.excludePathPatterns("/mobile/dictionary/**")
 		;
 
 

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/DataDictionaryApiController.java

@@ -0,0 +1,72 @@
+package com.jpsoft.employment.modules.mobile.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.jpsoft.employment.exception.CustomException;
+import com.jpsoft.employment.modules.base.entity.PersonInfo;
+import com.jpsoft.employment.modules.base.service.PersonInfoService;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.utils.JwtUtil;
+import com.jpsoft.employment.modules.common.utils.SMSUtil;
+import com.jpsoft.employment.modules.sys.entity.DataDictionary;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@RestController
+@RequestMapping("/mobile/dictionary")
+@Api(description = "字典接口")
+public class DataDictionaryApiController {
+    @Value("${jwt.secret}")
+    private String jwtSecret;
+
+    @Autowired
+    RabbitTemplate rabbitTemplate;
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @PostMapping("findByName")
+    @ApiOperation(value = " 根据字典名称查询字典(公开接口)")
+    public MessageResult<Map> findByName(String name) {
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        try {
+             List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName(name);
+
+            Map<String, Object> dataMap = new HashMap<String, Object>();
+            dataMap.put("dictionaryList", dataDictionaryList);
+
+            msgResult.setData(dataMap);
+            msgResult.setResult(true);
+        } catch (Exception ex) {
+            if (ex instanceof CustomException) {
+                log.error(ex.getMessage());
+            } else {
+                log.error(ex.getMessage(), ex);
+            }
+
+            msgResult.setMessage(ex.getMessage());
+            msgResult.setResult(false);
+        }
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/NewsApiController.java

@@ -70,7 +70,7 @@ public class NewsApiController {
 
         try {
 
-            MessageResult<Map> msgResult = new MessageResult<>();
+            
 
             Map<String,Object> searchParams = new HashMap<>();
 
@@ -84,15 +84,8 @@ public class NewsApiController {
             for (NewsInfo newsInfo:page) {
                 newsInfo.setCategoryN(dataDictionaryService.findNameByCatalogNameAndValue("新闻类型",newsInfo.getCategory()));
             }
-
-            msgResult.setResult(true);
-            msgResult.setData(PojoUtils.pageWrapper(page));
-
-            msgResult.setResult(true);
-            msgResult.setData(PojoUtils.pageWrapper(page));
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
+            messageResult.setData(PojoUtils.pageWrapper(page));
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);
@@ -108,7 +101,7 @@ public class NewsApiController {
             @RequestParam(value = "id", defaultValue = "") String id) {
         MessageResult<Map> messageResult = new MessageResult<>();
         try {
-            MessageResult<Map> msgResult = new MessageResult<>();
+            
             Map<String,Object> returnMap = new HashMap<>();
 
             NewsInfo newsInfo = newsInfoService.get(id);
@@ -119,11 +112,8 @@ public class NewsApiController {
 
             returnMap.put("newsInfo",newsInfo);
 
-            msgResult.setResult(true);
-            msgResult.setData(returnMap);
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
+            messageResult.setData(returnMap);
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);
@@ -146,7 +136,7 @@ public class NewsApiController {
 
         try {
 
-            MessageResult<Map> msgResult = new MessageResult<>();
+            
 
             Map<String,Object> searchParams = new HashMap<>();
 
@@ -163,11 +153,8 @@ public class NewsApiController {
             for (ShareWorksInfo shareWorksInfo:page) {
                 shareWorksInfo.setTypeN(dataDictionaryService.findNameByCatalogNameAndValue("共享用工类型",shareWorksInfo.getType()));
             }
-            msgResult.setResult(true);
-            msgResult.setData(PojoUtils.pageWrapper(page));
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
+            messageResult.setData(PojoUtils.pageWrapper(page));
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);
@@ -183,7 +170,7 @@ public class NewsApiController {
             @RequestParam(value = "id", defaultValue = "") String id) {
         MessageResult<Map> messageResult = new MessageResult<>();
         try {
-            MessageResult<Map> msgResult = new MessageResult<>();
+            
             Map<String,Object> returnMap = new HashMap<>();
 
             ShareWorksInfo shareWorksInfo = shareWorksInfoService.get(id);
@@ -195,11 +182,8 @@ public class NewsApiController {
 
             returnMap.put("shareWorksInfo",shareWorksInfo);
 
-            msgResult.setResult(true);
-            msgResult.setData(returnMap);
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
+            messageResult.setData(returnMap);
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);
@@ -218,7 +202,7 @@ public class NewsApiController {
 
         try {
 
-            MessageResult<Map> msgResult = new MessageResult<>();
+            
 
             Map<String,Object> searchParams = new HashMap<>();
 
@@ -235,11 +219,8 @@ public class NewsApiController {
                 }
             }
 
-            msgResult.setResult(true);
-            msgResult.setData(PojoUtils.pageWrapper(page));
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
+            messageResult.setData(PojoUtils.pageWrapper(page));
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);
@@ -255,7 +236,7 @@ public class NewsApiController {
             @RequestParam(value = "id", defaultValue = "") String id) {
         MessageResult<Map> messageResult = new MessageResult<>();
         try {
-            MessageResult<Map> msgResult = new MessageResult<>();
+            
             Map<String,Object> returnMap = new HashMap<>();
 
             TrainingInfo trainingInfo = trainingInfoService.get(id);
@@ -270,11 +251,8 @@ public class NewsApiController {
 
             returnMap.put("trainingInfo",trainingInfo);
 
-            msgResult.setResult(true);
-            msgResult.setData(returnMap);
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
+            messageResult.setData(returnMap);
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruitApiController.java

@@ -64,8 +64,6 @@ public class RecruitApiController {
 
         try {
 
-            MessageResult<Map> msgResult = new MessageResult<>();
-
             Map<String,Object> searchParams = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
@@ -82,11 +80,8 @@ public class RecruitApiController {
                 recruitInformationInfo.setIndustryN(dataDictionaryService.findNameByCatalogNameAndValue("意向行业",recruitInformationInfo.getIndustry()));
             }
 
-            msgResult.setResult(true);
-            msgResult.setData(PojoUtils.pageWrapper(page));
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
+            messageResult.setData(PojoUtils.pageWrapper(page));
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);
@@ -120,8 +115,6 @@ public class RecruitApiController {
 
         try {
 
-            MessageResult<Map> msgResult = new MessageResult<>();
-
             Map<String,Object> searchParams = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
@@ -130,7 +123,7 @@ public class RecruitApiController {
 
             if("0".equals(status)){
                 if (StringUtils.isNotEmpty(content)) {
-                    searchParams.put("positionName","%" + content.trim() + "%");
+                    searchParams.put("content","%" + content.trim() + "%");
                 }
 
                 if (StringUtils.isNotEmpty(type)) {
@@ -151,10 +144,10 @@ public class RecruitApiController {
                     recruitInformationInfo.setIndustryN(dataDictionaryService.findNameByCatalogNameAndValue("意向行业",recruitInformationInfo.getIndustry()));
                 }
 
-                msgResult.setData(PojoUtils.pageWrapper(page));
+                messageResult.setData(PojoUtils.pageWrapper(page));
             }else if("1".equals(status)){
                 if (StringUtils.isNotEmpty(content)) {
-                    searchParams.put("serviceDesc","%" + content.trim() + "%");
+                    searchParams.put("content","%" + content.trim() + "%");
                 }
                 if (StringUtils.isNotEmpty(type)) {
                     searchParams.put("method",type);
@@ -200,13 +193,10 @@ public class RecruitApiController {
                     }
                 }
 
-                msgResult.setData(PojoUtils.pageWrapper(page));
+                messageResult.setData(PojoUtils.pageWrapper(page));
             }
 
-            msgResult.setResult(true);
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);
@@ -228,9 +218,6 @@ public class RecruitApiController {
         MessageResult<Map> messageResult = new MessageResult<>();
 
         try {
-
-            MessageResult<Map> msgResult = new MessageResult<>();
-
             Map<String,Object> searchParams = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
@@ -247,11 +234,8 @@ public class RecruitApiController {
                 recruitInformationInfo.setIndustryN(dataDictionaryService.findNameByCatalogNameAndValue("意向行业",recruitInformationInfo.getIndustry()));
             }
 
-            msgResult.setResult(true);
-            msgResult.setData(PojoUtils.pageWrapper(page));
-
             messageResult.setResult(true);
-            messageResult.setCode(200);
+            messageResult.setData(PojoUtils.pageWrapper(page));
         } catch (Exception ex) {
             log.error(ex.getMessage());
             messageResult.setResult(false);

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/UserApiController.java

@@ -280,6 +280,12 @@ public class UserApiController {
         return msgResult;
     }
 
+
+
+
+
+
+
     public static void main(String[] args) {
         int status = new BigDecimal("0").compareTo(BigDecimal.ZERO);
         System.out.println(status);