列表权限问题

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,39 @@ 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();
+					userName = company.getContactPerson();
+					tel = company.getTel();
+				}
+
 			}
 			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 +148,23 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				resumeDeliverContent.setTodoTime(model.getChatDateStr());
 				resumeDeliverContent.setTodoMinuteStart(model.getBeginTime());
 				resumeDeliverContent.setTodoMinuteEnd(model.getEndTime());
+//				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());
+//				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 +177,98 @@ 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("3")){
+//			//沟通消息
+//			messageNotice.setTitle("沟通邀请通知");
+//
+//			MessageNotice templateMessageNotice = messageNoticeDAO.get("8d977cbb-2751-4ca1-8ed6-7ab97cfc47e1");//沟通邀请模版
+//
+//			String templateContent = templateMessageNotice.getContent();
+//
+//			templateContent.replace("{jobUserName}",jobUserName);
+//			templateContent.replace("{companyName}",companyName);
+//			templateContent.replace("{userName}",userName);
+//			templateContent.replace("{dateTime}",dateTime);
+//			templateContent.replace("{tel}",tel);
+//			templateContent.replace("{address}",address);
+//			templateContent.replace("{sendDate}",sendDate);
+//			templateContent.replace("{department}",department);
+//
+//			messageNotice.setContent(templateContent);
+//
+//			affectCount = messageNoticeDAO.insert(messageNotice);
+//
+//		}
+//		else if(chatType.equals("4")){
+//			//面试消息
+//			messageNotice.setTitle("面试邀请通知");
+//
+//			MessageNotice templateMessageNotice = messageNoticeDAO.get("4f12400a-7ec7-4dc8-bb30-14e7afcff134");
+//
+//			String templateContent = templateMessageNotice.getContent();
+//
+//			templateContent.replace("{jobUserName}",jobUserName);
+//			templateContent.replace("{companyName}",companyName);
+//			templateContent.replace("{userName}",userName);
+//			templateContent.replace("{dateTime}",dateTime);
+//			templateContent.replace("{tel}",tel);
+//			templateContent.replace("{address}",address);
+//			templateContent.replace("{sendDate}",sendDate);
+//			templateContent.replace("{department}",department);
+//
+//			messageNotice.setContent(templateContent);
+//
+//			affectCount = messageNoticeDAO.insert(messageNotice);
+//
+//		}
+//		else if(chatType.equals("6")){
+//			//入职消息
+//			messageNotice.setTitle("录用意向书");
+//
+//			MessageNotice templateMessageNotice = messageNoticeDAO.get("1c0bc8f4-e318-4e89-8745-13605be669c5");
+//
+//			String templateContent = templateMessageNotice.getContent();
+//
+//			templateContent.replace("{jobUserName}",jobUserName);
+//			templateContent.replace("{companyName}",companyName);
+//			templateContent.replace("{idCard}",idCard);
+//			templateContent.replace("{position}",position);
+//			templateContent.replace("{positionDep}",positionDep);
+//			templateContent.replace("{workAddress}",workAddress);
+//
+//			templateContent.replace("{tel}",tel);
+//			templateContent.replace("{address}",address);
+//			templateContent.replace("{sendDate}",sendDate);
+//			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/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/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/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/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;
     }

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;
     }