Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!25

src/main/java/cn/timer/api/bean/zzgl/ZzglBmgwM.java

@@ -67,6 +67,9 @@ public class ZzglBmgwM extends Model<ZzglBmgwM> {
 	@ApiModelProperty(value = "备注 ", example = "备注")
 	@ApiModelProperty(value = "备注 ", example = "备注")
 	private String remark;
 	private String remark;
 
 
+	@ApiModelProperty(value = "部门领导id ", example = "9688")
+	private Integer leader;
+
 	@TableField(fill = FieldFill.UPDATE)
 	@TableField(fill = FieldFill.UPDATE)
 	@ApiModelProperty(value = "更新时间 ", example = "2019-10-01")
 	@ApiModelProperty(value = "更新时间 ", example = "2019-10-01")
 	private Date updateTime;
 	private Date updateTime;

src/main/java/cn/timer/api/controller/zzgl/ZzglController.java

@@ -71,7 +71,7 @@ public class ZzglController {
 	 */
 	 */
 	@GetMapping(value = "/otherlistent/{id}")
 	@GetMapping(value = "/otherlistent/{id}")
 	@ApiOperation(value = "获取岗位成员列表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "获取岗位成员列表", httpMethod = "GET", notes = "接口发布说明")
-	public Result<List<YgglMainEmp>> selectOtherlistent(@CurrentUser UserBean userBean, @PathVariable Integer id){
+	public Result<List<YgglMainEmp>> selectOtherlistent(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		Integer orgCode = userBean.getOrgCode();
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
@@ -79,6 +79,9 @@ public class ZzglController {
 		list.add(id);
 		list.add(id);
 		ZzglBmgwM.getDepts(list, id, zzglBmgwMs);
 		ZzglBmgwM.getDepts(list, id, zzglBmgwMs);
 
 
+		ZzglBmgwM messsage = ZzglBmgwM.builder().build().selectOne(new QueryWrapper<ZzglBmgwM>().eq("id", id));
+		Integer lead = messsage.getLeader(); // 获取部门或岗位领导id
+
 		if (list == null || list.size() == 0) {
 		if (list == null || list.size() == 0) {
 			return ResultUtil.error("部门信息不存在，请先添加部门！");
 			return ResultUtil.error("部门信息不存在，请先添加部门！");
 		} else {
 		} else {
@@ -86,11 +89,11 @@ public class ZzglController {
 			ygglMainEmpsLambdaQueryWrapper
 			ygglMainEmpsLambdaQueryWrapper
 					.select(YgglMainEmp::getId, YgglMainEmp::getEmpNum, YgglMainEmp::getName, YgglMainEmp::getPhone,
 					.select(YgglMainEmp::getId, YgglMainEmp::getEmpNum, YgglMainEmp::getName, YgglMainEmp::getPhone,
 							YgglMainEmp::getBmgwId)
 							YgglMainEmp::getBmgwId)
-					.eq(YgglMainEmp::getOrgCode, orgCode).and(i -> i.in(YgglMainEmp::getBmgwId, list.toArray()));
+					.eq(YgglMainEmp::getOrgCode, orgCode).and(i -> i.in(YgglMainEmp::getBmgwId, list.toArray()))
+					.last(lead != null, "order by if (emp_num='" + lead + "',0,1)");
 			List<YgglMainEmp> ygglMainEmps = YgglMainEmp.builder().build().selectList(ygglMainEmpsLambdaQueryWrapper);
 			List<YgglMainEmp> ygglMainEmps = YgglMainEmp.builder().build().selectList(ygglMainEmpsLambdaQueryWrapper);
 			return ResultUtil.data(ygglMainEmps);
 			return ResultUtil.data(ygglMainEmps);
 		}
 		}
-
 	}
 	}
 
 
 	/**
 	/**
@@ -101,7 +104,8 @@ public class ZzglController {
 	 */
 	 */
 	@PostMapping(value = "/listdgjl")
 	@PostMapping(value = "/listdgjl")
 	@ApiOperation(value = "获取调岗记录(weng)", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperation(value = "获取调岗记录(weng)", httpMethod = "POST", notes = "接口发布说明")
-	public Result<Object> selectlistdgjl(@CurrentUser UserBean userBean, @RequestBody LogDgjlsQueryDto logDgjlsQueryDto){
+	public Result<Object> selectlistdgjl(@CurrentUser UserBean userBean,
+			@RequestBody LogDgjlsQueryDto logDgjlsQueryDto) {
 		Integer orgCode = userBean.getOrgCode();
 		Integer orgCode = userBean.getOrgCode();
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
@@ -155,7 +159,7 @@ public class ZzglController {
 	 */
 	 */
 	@PostMapping(value = "/dept")
 	@PostMapping(value = "/dept")
 	@ApiOperation(value = "添加/修改部门", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperation(value = "添加/修改部门", httpMethod = "POST", notes = "接口发布说明")
-	public Result<ZzglBmgwM> adddept(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM){
+	public Result<ZzglBmgwM> adddept(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM) {
 		Boolean a = zzglBmgwM.getId() == null;
 		Boolean a = zzglBmgwM.getId() == null;
 		if (a && zzglBmgwM.getType() == null)
 		if (a && zzglBmgwM.getType() == null)
 			zzglBmgwM.setType((Integer) 0);
 			zzglBmgwM.setType((Integer) 0);
@@ -164,7 +168,6 @@ public class ZzglController {
 		if (a)
 		if (a)
 			return ResultUtil.data(zzglBmgwM);
 			return ResultUtil.data(zzglBmgwM);
 		return ResultUtil.success();
 		return ResultUtil.success();
-
 	}
 	}
 
 
 	/**
 	/**