Merge branch 'master' of http://116.63.33.55/git/zlhbw

wxdks/src/main/java/com/c3/wxdks/controller/RecruitController.java

@@ -131,7 +131,7 @@ public class RecruitController {
 //        map.put("page", (page - 1) * limit);
 //        map.put("limit", limit);
         map.put("releaseSort", releaseSort);
-        map.put("workExperience", recruit.getWorkExperience() != null ? recruit.getWorkExperience().split(",") : null);
+        map.put("workExperience", recruit.getWorkExperience());
         map.put("education", recruit.getEducation());
         map.put("orgNature", recruit.getOrgNature());
         map.put("scale", recruit.getScale());

wxdks/src/main/resources/com/c3/wxdks/mapper/RecruitMapper.xml

@@ -125,10 +125,12 @@
         WHERE
             1 = 1
             <if test="workExperience != null and workExperience.length > 0">
-                <foreach item="item" collection="workExperience">
+                <!--
+                 <foreach item="item" collection="workExperience">
                     and CONCAT(work_experience, ',') like CONCAT('%', #{item}, ',', '%')
                 </foreach>
-                <!-- and work_experience = #{workExperience} -->
+                 -->
+                and work_experience = #{workExperience}
             </if>
             <if test="education != null and education != ''">
                 <!-- <foreach item="item" collection="education">

wxdks/src/main/resources/static/zlhbw/jrwm/jrwm.js

@@ -109,52 +109,16 @@ function initPageClick() {
 		if (hasActive) {
 			$(this).removeClass('textActive');
 		} else {
-			if (dataValue && hasExpClass) {
-				$(this).addClass('textActive');
-				$(this).siblings('span[data-value=""]').removeClass('textActive');
-			} else {
-				$(this).siblings().removeClass('textActive');
-				$(this).addClass('textActive');
-			}
-
-			if (hasEduClass) {
-				$(this).siblings().removeClass('textActive');
-				$(this).addClass('textActive');
-			}
+			$(this).siblings().removeClass('textActive');
+			$(this).addClass('textActive');
 		}
 
 		if (hasExpClass) {
-			var workExp = condition.workExperience.split(',');
-			if (workExp.length == 1 && workExp[0] == ''){
-				workExp = []
-			}
-			if (dataValue) {
-				if (hasActive) {
-					workExp.splice(workExp.indexOf(dataValue));
-				} else {
-					workExp.push(dataValue);
-				}
-			} else {
-				workExp = [];
-			}
-			condition.workExperience = workExp.join(',');
+			condition.workExperience = dataValue;
 			getRecruitList();
 		}
 
 		if (hasEduClass) {
-			// var edu = condition.education.split(',');
-			// if (edu.length == 1 && edu[0] == ''){
-			// 	edu = []
-			// }
-			// if (dataValue) {
-			// 	if (hasActive) {
-			// 		edu.splice(edu.indexOf(dataValue));
-			// 	} else {
-			// 		edu.push(dataValue);
-			// 	}
-			// } else {
-			// 	edu = [];
-			// }
 			condition.education = dataValue;
 			getRecruitList();
 		}
@@ -193,8 +157,8 @@ function initPageClick() {
 	$('.xzconfirm').on('click', function () {
 		var qsxz = $('input[name=qsxz]').val();
 		var jsxz = $('input[name=jsxz]').val();
-		condition.minSalary = qsxz ? parseInt((qsxz.split('K')[0])*1000) : '';
-		condition.maxSalary = jsxz ? parseInt((jsxz.split('K')[0])*1000) : '';
+		condition.minSalary = qsxz.indexOf('k') != -1 ? parseInt((qsxz.split('K')[0])*1000) : qsxz;
+		condition.maxSalary = jsxz.indexOf('k') != -1 ? parseInt((jsxz.split('K')[0])*1000) : jsxz;
 		console.log("minSalary:"+condition.minSalary);
 		console.log("maxSalary:"+condition.maxSalary);
 		getRecruitList();