Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -130,7 +130,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="101")
 	@ApiModelProperty(value="工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="101")
     private Integer jobType;
     private Integer jobType;
     
     
-	@ApiModelProperty(value="员工状态 1试用、2正式、3离职中、4已离职",example="101")
+	@ApiModelProperty(value="员工状态 0试用、1正式、2离职中、3已离职",example="101")
     private Integer jobStatus;
     private Integer jobStatus;
     
     
 	@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")
 	@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -227,7 +227,7 @@ public class YgglController {
 			return ResultUtil.error("请输入empNum数组");
 			return ResultUtil.error("请输入empNum数组");
 		}
 		}
 		List<YgglMainEmp> yglList = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda()
 		List<YgglMainEmp> yglList = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda()
-				.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).in(YgglMainEmp::getEmpNum, empNumList).select(YgglMainEmp::getId,YgglMainEmp::getName,YgglMainEmp::getHeadUrl));
+				.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).in(YgglMainEmp::getEmpNum, empNumList).select(YgglMainEmp::getEmpNum,YgglMainEmp::getName,YgglMainEmp::getHeadUrl));
 		for (YgglMainEmp yg : yglList) {
 		for (YgglMainEmp yg : yglList) {
 			if (StringUtil.isEmpty(yg.getHeadUrl())) {
 			if (StringUtil.isEmpty(yg.getHeadUrl())) {
 				yg.setHeadUrl("");
 				yg.setHeadUrl("");
@@ -1756,6 +1756,11 @@ public class YgglController {
 	@ApiOperationSupport(order = 62)
 	@ApiOperationSupport(order = 62)
 	public Result<List<YgQueryDto>> queryEmpMessage(@CurrentUser UserBean userBean) {
 	public Result<List<YgQueryDto>> queryEmpMessage(@CurrentUser UserBean userBean) {
 		List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean);
 		List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean);
+		for (YgQueryDto yg : ygQueryDto) {
+			if (StringUtil.isEmpty(yg.getHeadUrl())) {
+				yg.setHeadUrl("");
+			}
+		}
 		return ResultUtil.data(ygQueryDto, "查询成功");
 		return ResultUtil.data(ygQueryDto, "查询成功");
 	}
 	}
 
 

src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java

@@ -66,4 +66,7 @@ public class YgQueryDto extends Page implements Serializable{
 	
 	
 	@ApiModelProperty(value="离职原因",example="123")
 	@ApiModelProperty(value="离职原因",example="123")
 	private String lzyy;
 	private String lzyy;
+	
+	@ApiModelProperty(value="头像url",example="url")
+	private String headUrl;
 }
 }

src/main/resources/mapping/yggl/YgglMainEmpMapper.xml

@@ -199,14 +199,15 @@
 			a.rz_time rzTime,
 			a.rz_time rzTime,
 			a.job_type jobType,
 			a.job_type jobType,
 			a.phone phone,
 			a.phone phone,
-			a.job_status jobStatus
+			a.job_status jobStatus,
+			a.head_url headUrl
 		FROM
 		FROM
 			yggl_main_emp a
 			yggl_main_emp a
 		LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
 		LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
 		WHERE
 		WHERE
 			a.org_code = #{orgCode}
 			a.org_code = #{orgCode}
 		AND
 		AND
-			a.job_status != 4
+			a.job_status in (0,1,2)
 		ORDER BY
 		ORDER BY
 			emp_num DESC
 			emp_num DESC
     </select>
     </select>