Merge remote-tracking branch 'origin/master'

common/src/main/resources/mapper/job/Recruitment.xml

@@ -226,11 +226,11 @@
 				sddc.name_ AS industry
 			FROM
 				job_recruitment AS jr
-			INNER JOIN base_company AS bc ON jr.company_id = bc.id_
-			INNER JOIN sys_data_dictionary AS sdda ON bc.scale_ = sdda.id_
-			INNER JOIN sys_data_dictionary AS sddb ON jr.wage_type = sddb.id_
-			INNER JOIN sys_data_dictionary AS sddc ON bc.industry_ = sddc.id_
-			INNER JOIN base_city AS bci ON jr.area_ = bci.id_
+			LEFT JOIN base_company AS bc ON jr.company_id = bc.id_
+			LEFT JOIN sys_data_dictionary AS sdda ON bc.scale_ = sdda.id_
+			LEFT JOIN sys_data_dictionary AS sddb ON jr.wage_type = sddb.id_
+			LEFT JOIN sys_data_dictionary AS sddc ON bc.industry_ = sddc.id_
+			LEFT JOIN base_city AS bci ON jr.area_ = bci.id_
 		]]>
 		<where>
 			<if test="searchParams.title != null">

common/src/main/resources/mapper/sys/User.xml

@@ -15,6 +15,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="openId" column="open_id"/>
         <result property="companyId" column="company_id"/>
+        <result property="companyName" column="company_name"/>
     </resultMap>
 
     <resultMap id="UserVOMap" type="com.jpsoft.employment.modules.sys.entity.UserVO" extends="UserMap">
@@ -102,8 +103,10 @@
     </select>
     <select id="search" parameterType="hashmap" resultMap="UserMap">
         <![CDATA[
-			select a.*
+			select a.*,
+			b.name_ as company_name
 			from sys_user a
+			left join base_company b on a.company_id = b.id_
 			where a.del_flag = 0
 		]]>
         <if test="searchParams.userName != null">
@@ -112,6 +115,9 @@
         <if test="searchParams.realName != null">
             and a.real_name like #{searchParams.realName}
         </if>
+        <if test="searchParams.companyId != null">
+            and a.company_id = #{searchParams.companyId}
+        </if>
         <if test="searchParams.roleId != null">
             and a.id_ in (select c.user_id from sys_user_role c where c.role_id = #{searchParams.roleId})
         </if>

web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeController.java

@@ -237,10 +237,7 @@ public class ResumeController {
             resume.setWorkExpName(dataDictionaryService.getName(resume.getWorkExp()));
             resume.setEducationName(dataDictionaryService.getName(resume.getEducation()));
             resume.setJobStatusName(dataDictionaryService.getName(resume.getJobStatus()));
-            if(resume.getUserIsAuthentication() == "1")
-                resume.setUserIsAuthenticationName("已实名");
-            else
-                resume.setUserIsAuthenticationName("未实名");
+            resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
             resume.setStatusName(dataDictionaryService.getName(resume.getStatus()));
         }
 

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

@@ -235,10 +235,7 @@ public class ResumeApiController {
             if(workCategory != null) {
                 resume.setPositionCategoryName(workCategory.getName());
             }
-            if(resume.getUserIsAuthentication() == "1")
-                resume.setUserIsAuthenticationName("已实名");
-            else
-                resume.setUserIsAuthenticationName("未实名");
+            resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
             resume.setStatusName(dataDictionaryService.getName(resume.getStatus()));
 
 
@@ -313,10 +310,7 @@ public class ResumeApiController {
             if(workCategory != null) {
                 resume.setPositionCategoryName(workCategory.getName());
             }
-            if(resume.getUserIsAuthentication() == "1")
-                resume.setUserIsAuthenticationName("已实名");
-            else
-                resume.setUserIsAuthenticationName("未实名");
+            resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
             resume.setStatusName(dataDictionaryService.getName(resume.getStatus()));
 
             //教育经验