Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/base/entity/EnterpriseCertificationApprove.java

@@ -43,7 +43,7 @@ public class EnterpriseCertificationApprove {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "审批时间")
     private Date approveTime;
-
-    private String isCertification;
-    private String isCertificationName;
+    @ApiModelProperty(value = "审批状态")
+    private String approveStatus;
+    private String approveStatusName;
 }

common/src/main/java/com/jpsoft/employment/modules/base/entity/LabourServicesApprove.java

@@ -21,6 +21,7 @@ public class LabourServicesApprove {
         @ApiModelProperty(value = "")
     private String createBy;
     private String createByName;
+    private String companyName;
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "")
@@ -43,7 +44,7 @@ public class LabourServicesApprove {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "审批时间")
     private Date approveTime;
-
-    private String approvalStatus;
-    private String approvalStatusName;
+    @ApiModelProperty(value = "审批状态")
+    private String approveStatus;
+    private String approveStatusName;
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LabourServicesServiceImpl.java

@@ -47,6 +47,7 @@ public class LabourServicesServiceImpl implements LabourServicesService {
 			labourServicesApprove.setCreateTime(model.getCreateTime());
 			labourServicesApprove.setDelFlag(false);
 			labourServicesApprove.setLabourServicesId(model.getId());
+			labourServicesApprove.setApproveStatus(model.getApprovalStatus());
 
 
 			affectCount = labourServicesApproveDAO.insert(labourServicesApprove);

common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverRecordDTO.java

@@ -17,4 +17,9 @@ public class ResumeDeliverRecordDTO {
     private String resumeId;
     private String recruitmentId;
 
+    @ApiModelProperty(value = "联系人")
+    private String realName;
+    @ApiModelProperty(value = "联系方式")
+    private String companyPhone;
+
 }

common/src/main/java/com/jpsoft/employment/modules/job/entity/RecruitmentApprove.java

@@ -43,7 +43,7 @@ public class RecruitmentApprove {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "审批时间")
     private Date approveTime;
-
+    @ApiModelProperty(value = "审批状态")
     private String approveStatus;
     private String approveStatusName;
 }

common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliverRecord.java

@@ -76,4 +76,10 @@ public class ResumeDeliverRecord {
 
 	@ApiModelProperty(value = "招聘ID，用于显示，不保存数据库")
 	private String recruitmentId;
+
+
+	@ApiModelProperty(value = "联系人")
+	private String realName;
+	@ApiModelProperty(value = "联系方式")
+	private String companyPhone;
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/RecruitmentServiceImpl.java

@@ -51,6 +51,7 @@ public class RecruitmentServiceImpl implements RecruitmentService {
 			recruitmentApprove.setCreateTime(model.getCreateTime());
 			recruitmentApprove.setDelFlag(false);
 			recruitmentApprove.setRecruitmentId(model.getId());
+			recruitmentApprove.setApproveStatus(model.getApproveStatus());
 
 
 			affectCount = recruitmentApproveDAO.insert(recruitmentApprove);

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverRecordServiceImpl.java

@@ -1,10 +1,15 @@
 package com.jpsoft.employment.modules.job.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import javax.annotation.Resource;
 
+import com.jpsoft.employment.modules.base.dao.CompanyDAO;
+import com.jpsoft.employment.modules.base.dao.MessageNoticeDAO;
+import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.base.entity.MessageNotice;
 import com.jpsoft.employment.modules.common.utils.StringUtils;
 import com.jpsoft.employment.modules.job.dao.*;
 import com.jpsoft.employment.modules.job.entity.*;
@@ -32,7 +37,16 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
     private RecruitmentDAO recruitmentDAO;
 
     @Resource(name="resumeDAO")
-    private ResumeDAO resumeDAO;
+	private ResumeDAO resumeDAO;
+
+	@Resource(name="messageNoticeDAO")
+	private MessageNoticeDAO messageNoticeDAO;
+
+	@Resource(name="jobUserDAO")
+	private JobUserDAO jobUserDAO;
+
+	@Resource(name="companyDAO")
+	private CompanyDAO companyDAO;
 
 	@Override
 	public ResumeDeliverRecord get(String id) {
@@ -55,6 +69,8 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 
 		ResumeDeliver resumeDeliver;
 
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+
 		if(StringUtils.isEmpty(model.getResumeDeliverId())){
 			resumeDeliver = new ResumeDeliver();
 			resumeDeliver.setId(UUID.randomUUID().toString());
@@ -91,12 +107,40 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 
 			Resume resume = resumeDAO.get(resumeDeliver.getJobResumeId());
 
+			String jobUserName="";
+			String companyName="";
+			String userName="";
+			String dateTime = model.getChatDateStr()+ " " + model.getBeginTime() + "-" + model.getEndTime();
+			String sendDate = sdf.format(model.getCreateTime());
+			String tel="";
+			String department="人力资源部";
+			String idCard="";
+			String position="";//工作岗位
+			String positionDep="";//入职部门
+			String workAddress="";//工作地
+
+
 			resumeDeliverContent.setJobUserId(model.getJobUserId());
 			if(recruitment!=null){
 				resumeDeliverContent.setJobResumeId(recruitment.getId());
+
+				Company company = companyDAO.get(recruitment.getCompanyId());
+
+				if(company!=null){
+					companyName = company.getName();
+				}
+
+				position = resumeDeliverContent.getEntryPost();
+				positionDep = resumeDeliverContent.getEntryDepartment();
+				workAddress = recruitment.getAddress();
 			}
 			if(resume!=null){
 				resumeDeliverContent.setJobResumeId(resume.getId());
+				JobUser jobUser = jobUserDAO.get(resume.getJobUserId());
+				if(jobUser!=null){
+					jobUserName = jobUser.getRealName();
+					idCard = jobUser.getIdCard();
+				}
 			}
 
 			resumeDeliverContent.setChatStatus(chatType);
@@ -105,13 +149,29 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				resumeDeliverContent.setTodoTime(model.getChatDateStr());
 				resumeDeliverContent.setTodoMinuteStart(model.getBeginTime());
 				resumeDeliverContent.setTodoMinuteEnd(model.getEndTime());
+
+				userName = model.getRealName();
+				tel = model.getCompanyPhone();
+
+				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
+						idCard,position,positionDep,workAddress);
 			}
 			else if(chatType.equals("3")){
 				resumeDeliverContent.setAddress(model.getRemark());
+
+				userName = model.getRealName();
+				tel = model.getCompanyPhone();
+
+				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
+						idCard,position,positionDep,workAddress);
+
 			}
 			else if(chatType.equals("4")){
 				resumeDeliverContent.setEntryPost(model.getEntryPosition());
 				resumeDeliverContent.setEntryDepartment(model.getEntryDepartment());
+
+				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
+						idCard,position,positionDep,workAddress);
 			}
 			else if(chatType.equals("6")){
 				resumeDeliverContent.setRemark(model.getRemark());
@@ -124,6 +184,99 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 		return affectCount;
 	}
 
+	private int sendMessage(ResumeDeliverRecord model,String chatType,String jobUserName,String companyName,
+							String userName,String dateTime,String tel,String address,String sendDate,String department,
+							String idCard,String position,String positionDep,String workAddress
+	){
+		int affectCount = 0;
+
+		MessageNotice messageNotice = new MessageNotice();
+		messageNotice.setId(UUID.randomUUID().toString());
+		messageNotice.setDelFlag(false);
+		messageNotice.setCreateBy(model.getCreateBy());
+		messageNotice.setCreateTime(model.getCreateTime());
+		messageNotice.setRecipientId(model.getJobUserId());
+		messageNotice.setClassify("2");//求职消息
+		messageNotice.setType("1");//站内消息
+		messageNotice.setDeliverId(model.getResumeDeliverId());
+		messageNotice.setIsNeedAgree(true);
+
+		messageNotice.setStatus(true);//审核状态是否
+
+		if(chatType.equals("2")){
+			//沟通消息
+			messageNotice.setTitle("沟通邀请通知");
+
+			MessageNotice templateMessageNotice = messageNoticeDAO.get("8d977cbb-2751-4ca1-8ed6-7ab97cfc47e1");//沟通邀请模版
+
+			String templateContent = templateMessageNotice.getContent();
+
+			templateContent = templateContent.replace("{jobUserName}",jobUserName);
+			templateContent =  templateContent.replace("{companyName}",companyName);
+			templateContent = templateContent.replace("{userName}",userName);
+			templateContent = templateContent.replace("{dateTime}",dateTime);
+			templateContent = templateContent.replace("{tel}",tel);
+			templateContent = templateContent.replace("{address}",address);
+			templateContent = templateContent.replace("{sendDate}",sendDate);
+			templateContent = templateContent.replace("{department}",department);
+
+
+			messageNotice.setContent(templateContent);
+
+			affectCount = messageNoticeDAO.insert(messageNotice);
+
+		}
+		else if(chatType.equals("3")){
+			//面试消息
+			messageNotice.setTitle("面试邀请通知");
+
+			MessageNotice templateMessageNotice = messageNoticeDAO.get("4f12400a-7ec7-4dc8-bb30-14e7afcff134");
+
+			String templateContent = templateMessageNotice.getContent();
+
+			templateContent = templateContent.replace("{jobUserName}",jobUserName);
+			templateContent = templateContent.replace("{companyName}",companyName);
+			templateContent = templateContent.replace("{userName}",userName);
+			templateContent = templateContent.replace("{dateTime}",dateTime);
+			templateContent = templateContent.replace("{tel}",tel);
+			templateContent = templateContent.replace("{address}",address);
+			templateContent = templateContent.replace("{sendDate}",sendDate);
+			templateContent = templateContent.replace("{department}",department);
+
+			messageNotice.setContent(templateContent);
+
+			affectCount = messageNoticeDAO.insert(messageNotice);
+
+		}
+		else if(chatType.equals("4")){
+			//入职消息
+			messageNotice.setTitle("录用意向书");
+
+			MessageNotice templateMessageNotice = messageNoticeDAO.get("1c0bc8f4-e318-4e89-8745-13605be669c5");
+
+			String templateContent = templateMessageNotice.getContent();
+
+			templateContent = templateContent.replace("{jobUserName}",jobUserName);
+			templateContent = templateContent.replace("{companyName}",companyName);
+			templateContent = templateContent.replace("{idCard}",idCard);
+			templateContent = templateContent.replace("{position}",position);
+			templateContent = templateContent.replace("{positionDep}",positionDep);
+			templateContent = templateContent.replace("{workAddress}",workAddress);
+
+			templateContent = templateContent.replace("{tel}",tel);
+			templateContent = templateContent.replace("{address}",address);
+			templateContent = templateContent.replace("{sendDate}",sendDate);
+			templateContent = templateContent.replace("{department}",department);
+
+			messageNotice.setContent(templateContent);
+
+			affectCount = messageNoticeDAO.insert(messageNotice);
+
+		}
+
+		return affectCount;
+	}
+
 	@Override
 	public int update(ResumeDeliverRecord model) {
 		// TODO Auto-generated method stub

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

@@ -13,8 +13,7 @@
 		<result property="companyId" column="company_id" />
 		<result property="approvePersonId" column="approve_person_id" />
 		<result property="approveTime" column="approve_time" />
-
-		<result property="isCertification" column="is_certification" />
+		<result property="approveStatus" column="approve_status" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove">
 	<!--
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into base_enterprise_certification_approve
-	    (id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_person_id,approve_time)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_person_id,approve_time,approve_status)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +35,7 @@
 ,#{companyId,jdbcType=VARCHAR}
 ,#{approvePersonId,jdbcType=VARCHAR}
 ,#{approveTime,jdbcType= TIMESTAMP }
+,#{approveStatus,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -69,12 +69,15 @@
 				<if test="approveTime!=null">
 		approve_time=#{approveTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="approveStatus!=null">
+				approve_status=#{approveStatus,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="EnterpriseCertificationApproveMap">
 		select 
-id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_person_id,approve_time		from base_enterprise_certification_approve where id_=#{0}
+id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_person_id,approve_time,approve_status		from base_enterprise_certification_approve where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_enterprise_certification_approve where id_=#{0}
@@ -88,12 +91,11 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,approve_pers
 
 	<select id="search" parameterType="hashmap" resultMap="EnterpriseCertificationApproveMap">
 		<![CDATA[
-			SELECT a.*,b.is_certification FROM base_enterprise_certification_approve a
-			LEFT JOIN base_company b ON a.company_id = b.id_
+			SELECT * FROM base_enterprise_certification_approve
 		]]>
 		<where>
-			<if test="searchParams.isCertification != null">
-				and b.is_certification = #{searchParams.isCertification}
+			<if test="searchParams.approveStatus != null">
+				and approve_status = #{searchParams.approveStatus}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -105,6 +105,9 @@
 		]]>
 		<where>
 			del_flag = false
+			<if test="searchParams.userId != null">
+				and create_by = #{searchParams.userId}
+			</if>
 			<if test="searchParams.approvalStatus != null">
 				and approval_status = #{searchParams.approvalStatus}
 			</if>

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

@@ -13,8 +13,7 @@
 		<result property="labourServicesId" column="labour_services_id" />
 		<result property="approvePersonId" column="approve_person_id" />
 		<result property="approveTime" column="approve_time" />
-
-		<result property="approvalStatus" column="approval_status" />
+		<result property="approveStatus" column="approve_status" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.LabourServicesApprove">
 	<!--
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into base_labour_services_approve
-	    (id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,approve_person_id,approve_time)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,approve_person_id,approve_time,approve_status)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +35,7 @@
 ,#{labourServicesId,jdbcType=VARCHAR}
 ,#{approvePersonId,jdbcType=VARCHAR}
 ,#{approveTime,jdbcType= TIMESTAMP }
+,#{approveStatus,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -69,12 +69,15 @@
 				<if test="approveTime!=null">
 		approve_time=#{approveTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="approveStatus!=null">
+				approve_status=#{approveStatus,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="LabourServicesApproveMap">
 		select 
-id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,approve_person_id,approve_time		from base_labour_services_approve where id_=#{0}
+id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,approve_person_id,approve_time,approve_status		from base_labour_services_approve where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_labour_services_approve where id_=#{0}
@@ -84,12 +87,11 @@ id_,create_by,create_time,update_by,update_time,del_flag,labour_services_id,appr
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="LabourServicesApproveMap">
 		<![CDATA[
-			SELECT a.*,b.approval_status FROM base_labour_services_approve a
-			LEFT JOIN base_labour_services b ON a.labour_services_id = b.id_
+			SELECT * FROM base_labour_services_approve
 		]]>
 		<where>
-			<if test="searchParams.approvalStatus != null">
-				and b.approval_status = #{searchParams.approvalStatus}
+			<if test="searchParams.approveStatus != null">
+				and approve_status = #{searchParams.approveStatus}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -151,7 +151,7 @@
 			a.del_flag=false and b.del_flag=false
 			<if test="searchParams.not_jobStatus != null">
 				<![CDATA[
-					and a.job_status <> #{searchParams.not_jobStatus}
+					and (a.job_status <> #{searchParams.not_jobStatus} or a.job_status is null)
 				]]>
 			</if>
 			<if test="searchParams.positionCategoryId != null">

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

@@ -13,7 +13,6 @@
 		<result property="recruitmentId" column="recruitment_id" />
 		<result property="approvePersonId" column="approve_person_id" />
 		<result property="approveTime" column="approve_time" />
-
 		<result property="approveStatus" column="approve_status" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.job.entity.RecruitmentApprove">
@@ -24,7 +23,7 @@
 	-->
 	<![CDATA[
 		insert into job_recruitment_approve
-	    (id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_person_id,approve_time)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_person_id,approve_time,approve_status)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +35,7 @@
 ,#{recruitmentId,jdbcType=VARCHAR}
 ,#{approvePersonId,jdbcType=VARCHAR}
 ,#{approveTime,jdbcType= TIMESTAMP }
+,#{approveStatus,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -69,12 +69,15 @@
 				<if test="approveTime!=null">
 		approve_time=#{approveTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="approveStatus!=null">
+				approve_status=#{approveStatus,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="RecruitmentApproveMap">
 		select 
-id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_person_id,approve_time		from job_recruitment_approve where id_=#{0}
+id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_person_id,approve_time,approve_status		from job_recruitment_approve where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from job_recruitment_approve where id_=#{0}
@@ -84,12 +87,11 @@ id_,create_by,create_time,update_by,update_time,del_flag,recruitment_id,approve_
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="RecruitmentApproveMap">
 		<![CDATA[
-			SELECT a.*,b.approve_status FROM job_recruitment_approve a
-			LEFT JOIN job_recruitment b ON a.recruitment_id = b.id_
+			SELECT * FROM job_recruitment_approve
 		]]>
 		<where>
 			<if test="searchParams.approveStatus != null">
-				and b.approve_status = #{searchParams.approveStatus}
+				and approve_status = #{searchParams.approveStatus}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -86,6 +86,9 @@
 		]]>
 		<where>
 			a.del_flag = 0 and b.del_flag = 0
+			<if test="searchParams.userId != null">
+				and a.sys_user_id = #{searchParams.userId}
+			</if>
 			<if test="searchParams.positionCategoryId != null">
 				and b.position_category_id = #{searchParams.positionCategoryId}
 			</if>

web/src/main/java/com/jpsoft/employment/modules/base/controller/CompanyController.java

@@ -306,6 +306,7 @@ public class CompanyController {
 
         try {
             EnterpriseCertificationApprove enterpriseCertificationApprove = enterpriseCertificationApproveService.get(id);
+            enterpriseCertificationApprove.setApproveStatus("2");
             enterpriseCertificationApprove.setApprovePersonId(subject);
             enterpriseCertificationApprove.setApproveTime(new Date());
             enterpriseCertificationApprove.setUpdateBy(subject);

web/src/main/java/com/jpsoft/employment/modules/base/controller/EnterpriseCertificationApproveController.java

@@ -264,7 +264,7 @@ public class EnterpriseCertificationApproveController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String isCertification,
+            String approveStatus,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -273,17 +273,19 @@ public class EnterpriseCertificationApproveController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(isCertification)) {
-            searchParams.put("isCertification",isCertification);
+        if (StringUtils.isNotEmpty(approveStatus)) {
+            searchParams.put("approveStatus",approveStatus);
         }
 
         Page<EnterpriseCertificationApprove> page = enterpriseCertificationApproveService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(EnterpriseCertificationApprove enterpriseCertificationApprove : page.getResult()){
-            switch (enterpriseCertificationApprove.getIsCertification()){
-                case "1": enterpriseCertificationApprove.setIsCertificationName("未审批"); break;
-                case "2": enterpriseCertificationApprove.setIsCertificationName("已审批"); break;
+            if(StringUtils.isEmpty(enterpriseCertificationApprove.getApproveStatus()))
+                enterpriseCertificationApprove.setApproveStatus("1");
+            switch (enterpriseCertificationApprove.getApproveStatus()){
+                case "1": enterpriseCertificationApprove.setApproveStatusName("未审批"); break;
+                case "2": enterpriseCertificationApprove.setApproveStatusName("已审批"); break;
             }
             User user = userService.get(enterpriseCertificationApprove.getCreateBy());
             enterpriseCertificationApprove.setCreateByName(user.getRealName());

web/src/main/java/com/jpsoft/employment/modules/base/controller/LabourServicesApproveController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.base.entity.Company;
 import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
 import com.jpsoft.employment.modules.base.entity.LabourServices;
+import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.base.service.LabourServicesService;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -36,6 +37,8 @@ public class LabourServicesApproveController {
     private LabourServicesApproveService labourServicesApproveService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private CompanyService companyService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -206,7 +209,7 @@ public class LabourServicesApproveController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String approvalStatus,
+            String approveStatus,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -215,19 +218,25 @@ public class LabourServicesApproveController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(approvalStatus)) {
-            searchParams.put("approvalStatus",approvalStatus);
+        if (StringUtils.isNotEmpty(approveStatus)) {
+            searchParams.put("approveStatus",approveStatus);
         }
 
         Page<LabourServicesApprove> page = labourServicesApproveService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(LabourServicesApprove labourServicesApprove : page.getResult()){
-            switch (labourServicesApprove.getApprovalStatus()){
-                case "1": labourServicesApprove.setApprovalStatusName("未审批"); break;
-                case "2": labourServicesApprove.setApprovalStatusName("已审批"); break;
+            if(StringUtils.isEmpty(labourServicesApprove.getApproveStatus()))
+                labourServicesApprove.setApproveStatus("1");
+            switch (labourServicesApprove.getApproveStatus()){
+                case "1": labourServicesApprove.setApproveStatusName("未审批"); break;
+                case "2": labourServicesApprove.setApproveStatusName("已审批"); break;
             }
             User user = userService.get(labourServicesApprove.getCreateBy());
+            Company company = companyService.get(user.getCompanyId());
+            if(company != null){
+                labourServicesApprove.setCompanyName(company.getName());
+            }
             labourServicesApprove.setCreateByName(user.getRealName());
             LabourServices labourServices = labourServicesService.get(labourServicesApprove.getLabourServicesId());
             labourServicesApprove.setLabourServicesName(labourServices.getContent());

web/src/main/java/com/jpsoft/employment/modules/base/controller/LabourServicesController.java

@@ -246,58 +246,78 @@ public class LabourServicesController {
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        try {
 
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+            User user = userService.get(subject);
 
-        if (StringUtils.isNotEmpty(approvalStatus)) {
-            searchParams.put("approvalStatus",approvalStatus);
-        }
+            if(user==null){
+                throw new Exception("用户未登录，请先登录！");
+            }
+
+            Map<String,Object> searchParams = new HashMap<>();
 
-        if (StringUtils.isNotEmpty(approveTimeRange)) {
-            String[] timeRangeArray = approveTimeRange.split(",");
-            String beginTime = "";
-            String endTime = "";
-            beginTime+=" 00:00:00";
-            if (timeRangeArray.length == 1) {
-                beginTime = timeRangeArray[0];
-            } else if (timeRangeArray.length == 2) {
-                beginTime = timeRangeArray[0];
-                endTime = timeRangeArray[1];
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","desc"));
+
+            if(!userService.hasRole(user.getId(),"SYSADMIN")&&!userService.hasRole(user.getId(),"ADMIN")){
+                searchParams.put("userId", user.getId());
+            }
+
+            if (StringUtils.isNotEmpty(approvalStatus)) {
+                searchParams.put("approvalStatus",approvalStatus);
+            }
+
+            if (StringUtils.isNotEmpty(approveTimeRange)) {
+                String[] timeRangeArray = approveTimeRange.split(",");
+                String beginTime = "";
+                String endTime = "";
                 beginTime+=" 00:00:00";
-                endTime+=" 23:59:59";
+                if (timeRangeArray.length == 1) {
+                    beginTime = timeRangeArray[0];
+                } else if (timeRangeArray.length == 2) {
+                    beginTime = timeRangeArray[0];
+                    endTime = timeRangeArray[1];
+                    beginTime+=" 00:00:00";
+                    endTime+=" 23:59:59";
+                }
+
+                searchParams.put("beginTime", beginTime);
+                searchParams.put("endTime", endTime);
             }
 
-            searchParams.put("beginTime", beginTime);
-            searchParams.put("endTime", endTime);
-        }
 
+            Page<LabourServices> page = labourServicesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
-        Page<LabourServices> page = labourServicesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+            for (LabourServices labourServices:page) {
 
-        for (LabourServices labourServices:page) {
+                String typeN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接类型",labourServices.getType());
+
+                labourServices.setTypeN(typeN);
 
-            String typeN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接类型",labourServices.getType());
+                String approvalStatusN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接审批状态",labourServices.getApprovalStatus());
 
-            labourServices.setTypeN(typeN);
+                labourServices.setApprovalStatusN(approvalStatusN);
 
-            String approvalStatusN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接审批状态",labourServices.getApprovalStatus());
+                User curUser = userService.get(labourServices.getApprovePersonId());
 
-            labourServices.setApprovalStatusN(approvalStatusN);
+                if(curUser!=null) {
+                    labourServices.setApprovePersonName(curUser.getRealName());
+                }
 
-            User user = userService.get(labourServices.getApprovePersonId());
 
-            if(user!=null) {
-                labourServices.setApprovePersonName(user.getRealName());
             }
 
 
-        }
+            msgResult.setResult(true);
+            msgResult.setData(PojoUtils.pageWrapper(page));
 
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
 
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
 
         return msgResult;
     }
@@ -339,6 +359,7 @@ public class LabourServicesController {
 
         try {
             LabourServicesApprove labourServicesApprove = labourServicesApproveService.get(id);
+            labourServicesApprove.setApproveStatus("2");
             labourServicesApprove.setApprovePersonId(subject);
             labourServicesApprove.setApproveTime(new Date());
             labourServicesApprove.setUpdateBy(subject);

web/src/main/java/com/jpsoft/employment/modules/base/controller/UserAuthenticationApproveController.java

@@ -251,7 +251,7 @@ public class UserAuthenticationApproveController {
             UserAuthenticationApprove userAuthenticationApprove = userAuthenticationApproveService.get(id);
             userAuthenticationApprove.setApprovePersonId(subject);
             userAuthenticationApprove.setApproveTime(new Date());
-            userAuthenticationApprove.setApprovalStatus("2");
+            userAuthenticationApprove.setApprovalStatus("1");
             userAuthenticationApprove.setUpdateBy(subject);
             userAuthenticationApprove.setUpdateTime(new Date());
 

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

@@ -218,7 +218,7 @@ public class RecruitmentApproveController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
+        sortList.add(new Sort("create_time","desc"));
 
         if (StringUtils.isNotEmpty(approveStatus)) {
             searchParams.put("approveStatus",approveStatus);
@@ -226,6 +226,8 @@ public class RecruitmentApproveController {
 
         Page<RecruitmentApprove> page = recruitmentApproveService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(RecruitmentApprove recruitmentApprove : page.getResult()){
+            if(StringUtils.isEmpty(recruitmentApprove.getApproveStatus()))
+                recruitmentApprove.setApproveStatus("2");
             switch (recruitmentApprove.getApproveStatus()){
                 case "2": recruitmentApprove.setApproveStatusName("未审批"); break;
                 case "3": recruitmentApprove.setApproveStatusName("已审批"); break;

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

@@ -10,7 +10,9 @@ import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.job.entity.Recruitment;
+import com.jpsoft.employment.modules.job.entity.RecruitmentApprove;
 import com.jpsoft.employment.modules.job.entity.WorkCategory;
+import com.jpsoft.employment.modules.job.service.RecruitmentApproveService;
 import com.jpsoft.employment.modules.job.service.RecruitmentService;
 import com.jpsoft.employment.modules.job.service.WorkCategoryService;
 import com.jpsoft.employment.modules.sys.entity.DataDictionary;
@@ -39,6 +41,8 @@ public class RecruitmentController {
     @Autowired
     private RecruitmentService recruitmentService;
     @Autowired
+    private RecruitmentApproveService recruitmentApproveService;
+    @Autowired
     private CompanyService companyService;
     @Autowired
     private DataDictionaryService dataDictionaryService;
@@ -538,7 +542,7 @@ public class RecruitmentController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("a.create_time","desc"));
 
-        if (StringUtils.isNotEmpty(companyId)) {
+        if (StringUtils.isNotEmpty(companyId) && !"undefined".equals(companyId)) {
             searchParams.put("companyId",companyId);
         }
         if (StringUtils.isNotEmpty(area)) {
@@ -733,7 +737,7 @@ public class RecruitmentController {
 
     @ApiOperation(value="更新用户")
     @PostMapping("checked")
-    public MessageResult<Recruitment> checked(String id,@RequestAttribute String subject){
+    public MessageResult<Recruitment> checked(String id, String approveId, @RequestAttribute String subject){
         MessageResult<Recruitment> msgResult = new MessageResult<>();
 
         try {
@@ -745,6 +749,12 @@ public class RecruitmentController {
             int affectCount = recruitmentService.update(recruitment);
 
             if (affectCount > 0) {
+                RecruitmentApprove recruitmentApprove = recruitmentApproveService.get(approveId);
+                recruitmentApprove.setApproveStatus("3");
+                recruitmentApprove.setApprovePersonId(subject);
+                recruitmentApprove.setApproveTime(new Date());
+                recruitmentApproveService.update(recruitmentApprove);
+
                 msgResult.setResult(true);
                 msgResult.setData(recruitment);
             } else {

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

@@ -87,6 +87,7 @@ public class ResumeController {
             resume.setDreamMoneyName(dataDictionaryService.getName(resume.getDreamMoney()));
             resume.setWorkList(workList);
             resume.setEducateList(educationList);
+            resume.setDreamAddName(dataDictionaryService.getName(resume.getDreamAdd()));
             //人员就业轨迹
             Integer sortNo = 0;
             List<WorkStepDTO> workStepList = new ArrayList<>();

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

@@ -84,9 +84,9 @@ public class ResumeDeliverController {
     @ApiOperation(value="添加信息")
     @PostMapping("add")
     public MessageResult<ResumeDeliverRecord> add(@RequestBody ResumeDeliverRecordDTO resumeDeliverRecordDTO,@RequestAttribute String subject){
-        MessageResult<ResumeDeliverRecord> msgResult = new MessageResult<>();
+            MessageResult<ResumeDeliverRecord> msgResult = new MessageResult<>();
 
-        try {
+            try {
 
             ResumeDeliverRecord resumeDeliverRecord=new ResumeDeliverRecord();
             resumeDeliverRecord.setId(UUID.randomUUID().toString());
@@ -131,6 +131,9 @@ public class ResumeDeliverController {
                 resumeDeliverRecord.setChatDateStr(ChatDateStr);
                 resumeDeliverRecord.setBeginTime(beginTime);
                 resumeDeliverRecord.setEndTime(endTime);
+
+                resumeDeliverRecord.setRealName(resumeDeliverRecordDTO.getRealName());
+                resumeDeliverRecord.setCompanyPhone(resumeDeliverRecordDTO.getCompanyPhone());
             }
             else if(resumeDeliverRecordDTO.getChatType().equals("3")){
                 //邀请面试
@@ -147,6 +150,9 @@ public class ResumeDeliverController {
                     ChatDateStr = sdf.format(resumeDeliverRecordDTO.getChatDate());
                 }
                 resumeDeliverRecord.setRemark("面试时间：" + ChatDateStr + " " + resumeDeliverRecordDTO.getChatTime());
+
+                resumeDeliverRecord.setRealName(resumeDeliverRecordDTO.getRealName());
+                resumeDeliverRecord.setCompanyPhone(resumeDeliverRecordDTO.getCompanyPhone());
             }
             else if(resumeDeliverRecordDTO.getChatType().equals("4")){
                 //邀请入职

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

@@ -332,7 +332,10 @@ public class UserBrowseController {
             searchParams.put("endTime", endTime);
         }
 
-        searchParams.put("companyId",user.getCompanyId());
+
+        if(!userService.hasRole(user.getId(),"SYSADMIN")&&!userService.hasRole(user.getId(),"ADMIN")){
+            searchParams.put("companyId",user.getCompanyId());
+        }
 
         Page<UserBrowse> page = userBrowseService.pageSearchHR(searchParams,pageIndex,pageSize,true,sortList);
 

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

@@ -9,7 +9,9 @@ import com.jpsoft.employment.modules.job.dto.ResumeDeliverHrDTO;
 import com.jpsoft.employment.modules.job.entity.*;
 import com.jpsoft.employment.modules.job.service.*;
 import com.jpsoft.employment.modules.sys.entity.DataDictionary;
+import com.jpsoft.employment.modules.sys.entity.User;
 import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
+import com.jpsoft.employment.modules.sys.service.UserService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -44,6 +46,9 @@ public class UserBrowseHrController {
     @Autowired
     private WorkCategoryService workCategoryService;
 
+    @Autowired
+    private UserService userService;
+
     @ApiOperation(value="添加信息")
     @PostMapping("add")
     public MessageResult<UserBrowseHr> add(@ModelAttribute UserBrowseHr userBrowseHr){
@@ -211,147 +216,169 @@ public class UserBrowseHrController {
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        try {
 
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
+            User user = userService.get(subject);
 
-        if(StringUtils.isNotEmpty(positionCategoryId)){
-            searchParams.put("positionCategoryId",positionCategoryId);
-        }
+            if(user==null){
+                throw new Exception("用户未登录，请先登录！");
+            }
+
+            Map<String,Object> searchParams = new HashMap<>();
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("a.create_time","desc"));
 
-        if(StringUtils.isNotEmpty(sex)){
-            if(!"100b3725-cb26-4d71-af3c-5b01c98f776b".equals(sex)) {
-                searchParams.put("sex", sex);
+            if(!userService.hasRole(user.getId(),"SYSADMIN")&&!userService.hasRole(user.getId(),"ADMIN")){
+                searchParams.put("userId", user.getId());
             }
-        }
 
-        if(age!=null){
-            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
-            Calendar cal = Calendar.getInstance();
+            if(StringUtils.isNotEmpty(positionCategoryId)){
+                searchParams.put("positionCategoryId",positionCategoryId);
+            }
+
+            if(StringUtils.isNotEmpty(sex)){
+                if(!"100b3725-cb26-4d71-af3c-5b01c98f776b".equals(sex)) {
+                    searchParams.put("sex", sex);
+                }
+            }
 
-            cal.setTime(new Date());
+            if(age!=null){
+                SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
-            cal.add(Calendar.YEAR,-age);
+                Calendar cal = Calendar.getInstance();
 
-            String curDate = sdf.format(cal.getTime());
+                cal.setTime(new Date());
 
-            searchParams.put("curDate",curDate);
-        }
+                cal.add(Calendar.YEAR,-age);
 
-        if(StringUtils.isNotEmpty(workExp)){
-            searchParams.put("workExp",workExp);
-        }
+                String curDate = sdf.format(cal.getTime());
 
-        if(StringUtils.isNotEmpty(education)){
-            searchParams.put("education",education);
-        }
+                searchParams.put("curDate",curDate);
+            }
+
+            if(StringUtils.isNotEmpty(workExp)){
+                searchParams.put("workExp",workExp);
+            }
+
+            if(StringUtils.isNotEmpty(education)){
+                searchParams.put("education",education);
+            }
 
-        if (StringUtils.isNotEmpty(createTimeRange)) {
-            String[] timeRangeArray = createTimeRange.split(",");
-            String beginTime = "";
-            String endTime = "";
-            beginTime+=" 00:00:00";
-            if (timeRangeArray.length == 1) {
-                beginTime = timeRangeArray[0];
-            } else if (timeRangeArray.length == 2) {
-                beginTime = timeRangeArray[0];
-                endTime = timeRangeArray[1];
+            if (StringUtils.isNotEmpty(createTimeRange)) {
+                String[] timeRangeArray = createTimeRange.split(",");
+                String beginTime = "";
+                String endTime = "";
                 beginTime+=" 00:00:00";
-                endTime+=" 23:59:59";
+                if (timeRangeArray.length == 1) {
+                    beginTime = timeRangeArray[0];
+                } else if (timeRangeArray.length == 2) {
+                    beginTime = timeRangeArray[0];
+                    endTime = timeRangeArray[1];
+                    beginTime+=" 00:00:00";
+                    endTime+=" 23:59:59";
+                }
+
+                searchParams.put("beginTime", beginTime);
+                searchParams.put("endTime", endTime);
             }
 
-            searchParams.put("beginTime", beginTime);
-            searchParams.put("endTime", endTime);
-        }
 
+            Page<UserBrowseHr> page = userBrowseHrService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
-        Page<UserBrowseHr> page = userBrowseHrService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+            Page<ResumeDeliverHrDTO> pageDto = new Page<>();
 
-        Page<ResumeDeliverHrDTO> pageDto = new Page<>();
+            for (UserBrowseHr userBrowseHr:page) {
 
-        for (UserBrowseHr userBrowseHr:page) {
+                ResumeDeliverHrDTO dto = new ResumeDeliverHrDTO();
 
-            ResumeDeliverHrDTO dto = new ResumeDeliverHrDTO();
+                dto.setId(userBrowseHr.getId());
+                dto.setCreateTime(userBrowseHr.getCreateTime());
 
-            dto.setId(userBrowseHr.getId());
-            dto.setCreateTime(userBrowseHr.getCreateTime());
+                Resume resume = rsumeService.get(userBrowseHr.getJobResumeId());
 
-            Resume resume = rsumeService.get(userBrowseHr.getJobResumeId());
+                String workExpName="";
+                String dreamMoneyName="";
+                String educationName="";
+                String positionName = "";
 
-            String workExpName="";
-            String dreamMoneyName="";
-            String educationName="";
-            String positionName = "";
 
+                if(resume!=null){
+                    dto.setResumeId(resume.getId());
 
-            if(resume!=null){
-                dto.setResumeId(resume.getId());
+                    DataDictionary dataDictionary = dataDictionaryService.get(resume.getWorkExp());
 
-                DataDictionary dataDictionary = dataDictionaryService.get(resume.getWorkExp());
+                    if(dataDictionary!=null){
+                        workExpName = dataDictionary.getName();
+                    }
 
-                if(dataDictionary!=null){
-                    workExpName = dataDictionary.getName();
-                }
+                    DataDictionary dataDictionary1 = dataDictionaryService.get(resume.getDreamMoney());
+                    if(dataDictionary1!=null){
+                        dreamMoneyName = dataDictionary1.getName();
+                    }
 
-                DataDictionary dataDictionary1 = dataDictionaryService.get(resume.getDreamMoney());
-                if(dataDictionary1!=null){
-                    dreamMoneyName = dataDictionary1.getName();
-                }
+                    DataDictionary dataDictionary2 = dataDictionaryService.get(resume.getEducation());
 
-                DataDictionary dataDictionary2 = dataDictionaryService.get(resume.getEducation());
+                    if(dataDictionary2!=null){
+                        educationName = dataDictionary2.getName();
+                    }
 
-                if(dataDictionary2!=null){
-                    educationName = dataDictionary2.getName();
-                }
 
+                    List<ResumeWorkExperience> resumeWorkExperienceList = resumeWorkExperienceService.findByResumeId(resume.getId());
 
-                List<ResumeWorkExperience> resumeWorkExperienceList = resumeWorkExperienceService.findByResumeId(resume.getId());
+                    dto.setResumeWorkExperienceList(resumeWorkExperienceList);
 
-                dto.setResumeWorkExperienceList(resumeWorkExperienceList);
+                    dto.setSexN(resume.getSex());
 
-                dto.setSexN(resume.getSex());
 
+                    JobUser jobUser = jobUserService.get(resume.getJobUserId());
 
-                JobUser jobUser = jobUserService.get(resume.getJobUserId());
+                    if(jobUser!=null){
+                        dto.setJobUserId(jobUser.getId());
+                        dto.setHeadImageUrl(jobUser.getHeadImageUrl());
+                        dto.setName(jobUser.getRealName());
 
-                if(jobUser!=null){
-                    dto.setJobUserId(jobUser.getId());
-                    dto.setHeadImageUrl(jobUser.getHeadImageUrl());
-                    dto.setName(jobUser.getRealName());
+                        dto.setUserTel(jobUser.getTel());
 
-                    dto.setUserTel(jobUser.getTel());
+                        if(StringUtils.isNotEmpty(jobUser.getIdCard())){
+                            int ageN = IdcardUtil.getAgeByIdCard(jobUser.getIdCard());
+                            dto.setAge(ageN);
+                        }
+                    }
 
-                    if(StringUtils.isNotEmpty(jobUser.getIdCard())){
-                        int ageN = IdcardUtil.getAgeByIdCard(jobUser.getIdCard());
-                        dto.setAge(ageN);
+                    WorkCategory workCategory = workCategoryService.get(resume.getPositionCategoryId());
+                    if(workCategory!=null){
+                        positionName = workCategory.getName();
                     }
                 }
 
-                WorkCategory workCategory = workCategoryService.get(resume.getPositionCategoryId());
-                if(workCategory!=null){
-                    positionName = workCategory.getName();
-                }
+                dto.setPositionName(positionName);
+                dto.setWorkExp(workExpName);
+                dto.setEducation(educationName);
+                dto.setDreamMoney(dreamMoneyName);
+
+
+                pageDto.add(dto);
             }
 
-            dto.setPositionName(positionName);
-            dto.setWorkExp(workExpName);
-            dto.setEducation(educationName);
-            dto.setDreamMoney(dreamMoneyName);
+            pageDto.setPages(page.getPages());
+            pageDto.setTotal(page.getTotal());
+            pageDto.setPageNum(page.getPageNum());
 
 
-            pageDto.add(dto);
-        }
+            msgResult.setResult(true);
+            msgResult.setData(PojoUtils.pageWrapper(pageDto));
 
-        pageDto.setPages(page.getPages());
-        pageDto.setTotal(page.getTotal());
-        pageDto.setPageNum(page.getPageNum());
 
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
 
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(pageDto));
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
 
         return msgResult;
     }

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

@@ -47,6 +47,9 @@ public class WorkCategoryController {
 
         try {
             workCategory.setId(UUID.randomUUID().toString());
+            if(StringUtils.isEmpty(workCategory.getParentId())) {
+                workCategory.setParentId(null);
+            }
             workCategory.setDelFlag(false);
             workCategory.setCreateBy(subject);
             workCategory.setCreateTime(new Date());

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

@@ -46,7 +46,7 @@ public class LabourApiController {
     @PostMapping("getLabourList")
     @ApiOperation(value = "劳务对接列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "typeB", value = "类型(1：我要用工,2：我要工人)", required = false, paramType = "query"),
+            @ApiImplicitParam(name = "typeB", value = "类型(1：我要用工,2：我有工人)", required = false, paramType = "query"),
     })
     public MessageResult<Map> getLabourList(
             String approvalStatus,String approveTimeRange,String token,String typeB,
@@ -57,64 +57,85 @@ public class LabourApiController {
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        try {
 
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+            User user = userService.get(subject);
 
-        if (StringUtils.isNotEmpty(approvalStatus)) {
-            searchParams.put("approvalStatus",approvalStatus);
-        }
+            if(user==null){
+                throw new Exception("用户未登录，请先登录！");
+            }
+
+            Map<String,Object> searchParams = new HashMap<>();
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","desc"));
+
+            if(!userService.hasRole(user.getId(),"SYSADMIN")&&!userService.hasRole(user.getId(),"ADMIN")){
+                searchParams.put("userId", user.getId());
+            }
+
+            if (StringUtils.isNotEmpty(approvalStatus)) {
+                searchParams.put("approvalStatus",approvalStatus);
+            }
 
-        searchParams.put("typeB",typeB);
-
-        if (StringUtils.isNotEmpty(approveTimeRange)) {
-            String[] timeRangeArray = approveTimeRange.split(",");
-            String beginTime = "";
-            String endTime = "";
-            beginTime+=" 00:00:00";
-            if (timeRangeArray.length == 1) {
-                beginTime = timeRangeArray[0];
-            } else if (timeRangeArray.length == 2) {
-                beginTime = timeRangeArray[0];
-                endTime = timeRangeArray[1];
+            if (StringUtils.isNotEmpty(approveTimeRange)) {
+                String[] timeRangeArray = approveTimeRange.split(",");
+                String beginTime = "";
+                String endTime = "";
                 beginTime+=" 00:00:00";
-                endTime+=" 23:59:59";
+                if (timeRangeArray.length == 1) {
+                    beginTime = timeRangeArray[0];
+                } else if (timeRangeArray.length == 2) {
+                    beginTime = timeRangeArray[0];
+                    endTime = timeRangeArray[1];
+                    beginTime+=" 00:00:00";
+                    endTime+=" 23:59:59";
+                }
+
+                searchParams.put("beginTime", beginTime);
+                searchParams.put("endTime", endTime);
             }
 
-            searchParams.put("beginTime", beginTime);
-            searchParams.put("endTime", endTime);
-        }
+            if (StringUtils.isNotEmpty(typeB)) {
+                searchParams.put("typeB",typeB);
+            }
 
+            Page<LabourServices> page = labourServicesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
-        Page<LabourServices> page = labourServicesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+            for (LabourServices labourServices:page) {
 
-        for (LabourServices labourServices:page) {
+                String typeN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接类型",labourServices.getType());
 
-            String typeN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接类型",labourServices.getType());
+                labourServices.setTypeN(typeN);
 
-            labourServices.setTypeN(typeN);
+                String approvalStatusN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接审批状态",labourServices.getApprovalStatus());
 
-            String approvalStatusN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接审批状态",labourServices.getApprovalStatus());
+                labourServices.setApprovalStatusN(approvalStatusN);
 
-            labourServices.setApprovalStatusN(approvalStatusN);
+                User curUser = userService.get(labourServices.getApprovePersonId());
 
-            User user = userService.get(labourServices.getApprovePersonId());
+                if(curUser!=null) {
+                    labourServices.setApprovePersonName(curUser.getRealName());
+                }
 
-            if(user!=null) {
-                labourServices.setApprovePersonName(user.getRealName());
-            }
+                Company company = companyService.get(user.getCompanyId());
 
-            Company company = companyService.get(user.getCompanyId());
+                if(company!=null) {
+                    labourServices.setCompanyName(company.getName());
+                }
 
-            if(company!=null) {
-                labourServices.setCompanyName(company.getName());
             }
 
+            msgResult.setResult(true);
+            msgResult.setData(PojoUtils.pageWrapper(page));
+
         }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
 
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
 
         return msgResult;
     }
@@ -123,17 +144,25 @@ public class LabourApiController {
     @ApiOperation(value = "劳务对接详情")
     public MessageResult<Map> getLabourDetails(
             @PathVariable("id") String id,
-            String token) {
+            String token,
+            @RequestAttribute String subject) {
         MessageResult<Map> msgResult = new MessageResult<>();
         Map<String, Object> map = new HashMap<>();
 
         try {
             LabourServices labourServices = labourServicesService.get(id);
-            User user = userService.get(labourServices.getApprovePersonId());
+            User user = userService.get(labourServices.getCreateBy());
             Company company = companyService.get(user.getCompanyId());
 
+            switch (labourServices.getType()){
+                case "1": labourServices.setTypeN("我要用工人");break;
+                case "2": labourServices.setTypeN("我有工人");break;
+            }
+
             map.put("labourServices",labourServices);
-            map.put("company",company);
+            map.put("logo",company.getLogo());
+            map.put("name",company.getName());
+
 
             if (labourServices != null) {
                 msgResult.setResult(true);

web/src/main/resources/application-dev.yml

@@ -7,14 +7,14 @@ spring:
   datasource:
 
     #开发环境
-     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft2016
+#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft2016
 
     #测试环境
-#     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft8121234
+     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft8121234
 
     #正式环境
       #url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/enterprise_federation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8