Merge branch 'wdz' into 'develop'

Wdz

See merge request 8timerv2/8timerapiv200!64

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

@@ -183,7 +183,10 @@ public class YgglController {
 		List<YgglMainEmp> ygglMainEmps = empNumsConfirm(orgCode, leaderList);
 		List<YgglMainEmp> ygglMainEmps = empNumsConfirm(orgCode, leaderList);
 		List<LoginerChargeDto> loginerChargeDtos =new ArrayList<LoginerChargeDto>();
 		List<LoginerChargeDto> loginerChargeDtos =new ArrayList<LoginerChargeDto>();
 		for (YgglMainEmp m : ygglMainEmps) {
 		for (YgglMainEmp m : ygglMainEmps) {
-			loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(),m.getName()));
+			if (m.getHeadUrl() == null) {
+				m.setHeadUrl("");
+			}
+			loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(),m.getName(),m.getHeadUrl()));
 		}
 		}
 		Collections.reverse(loginerChargeDtos);
 		Collections.reverse(loginerChargeDtos);
 		return ResultUtil.data(loginerChargeDtos, "获取上级部门的部门id");
 		return ResultUtil.data(loginerChargeDtos, "获取上级部门的部门id");
@@ -1605,40 +1608,9 @@ public class YgglController {
 		return ResultUtil.data(mz, "展示该民族");
 		return ResultUtil.data(mz, "展示该民族");
 	}
 	}
 
 
-	/**
-	 * 展示籍贯/展示所有籍贯
-	 * 
-	 * @param
-	 * @return
-	 *//*
-		 * @PostMapping(value = "/jg")
-		 * 
-		 * @ApiOperation(value = "展示籍贯所有省市区", httpMethod = "POST", notes = "接口发布说明")
-		 * 
-		 * @ApiOperationSupport(order = 60) public Result<List<YgjgDto>>
-		 * selectjgs(@CurrentUser UserBean userBean, @RequestBody YgjgDto ygjgDto) {
-		 * Integer type = ygjgDto.getType(); Integer upId = ygjgDto.getJgid();
-		 * List<YgjgDto> maps = new ArrayList<YgjgDto>(); if (type == 1) { // 省份
-		 * List<YgProDto> list = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper)
-		 * .select(YgProDto::getId, YgProDto::getProvince,
-		 * YgProDto::getName).orderByAsc(YgProDto::getProvince) .list(); for (YgProDto
-		 * pro : list) { maps.add(new YgjgDto(pro.getId(), pro.getProvince(),
-		 * pro.getName(), null)); } } if (type == 2) { // 城市 List<YgCityDto> list = new
-		 * LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper) .select(YgCityDto::getId,
-		 * YgCityDto::getCity, YgCityDto::getName).eq(YgCityDto::getProvince, upId)
-		 * .orderByAsc(YgCityDto::getProvince).orderByAsc(YgCityDto::getCity).list();
-		 * for (YgCityDto city : list) { maps.add(new YgjgDto(city.getId(),
-		 * city.getCity(), city.getName(), null)); } } if (type == 3) { // 地区
-		 * List<YgAreaDto> list = new
-		 * LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper) .select(YgAreaDto::getId,
-		 * YgAreaDto::getName).eq(YgAreaDto::getCity, upId)
-		 * .orderByAsc(YgAreaDto::getProvince).orderByAsc(YgAreaDto::getCity).list();
-		 * for (YgAreaDto area : list) { maps.add(new YgjgDto(area.getId(),
-		 * area.getId(), area.getName(), null)); } } // IYgjgDto iYgjgDto =
-		 * PunishFactory.getPunish(type); // List<String> strings =
-		 * iYgjgDto.exePunish(); // System.out.println(strings); if (!maps.isEmpty())
-		 * return ResultUtil.data(maps, "展示籍贯成功"); return ResultUtil.success(null); }
-		 */
+	
+	  
+		 
 
 
 	/**
 	/**
 	 * 展示籍贯/展示所有籍贯(威力增强版)
 	 * 展示籍贯/展示所有籍贯(威力增强版)

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

@@ -38,5 +38,6 @@ public class LoginerChargeDto implements Serializable{
 	@ApiModelProperty(value="主管名称",example="李大力")
 	@ApiModelProperty(value="主管名称",example="李大力")
 	private String charge;
 	private String charge;
 	
 	
-
+	@ApiModelProperty(value="头像url",example="李大力")
+	private String headUrl;
 }
 }

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

@@ -32,7 +32,7 @@ public class YgjgDto implements Serializable{
 	
 	
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 
 
-	@ApiModelProperty(value="省市区分类id",example="省1,市2,区3")
+	@ApiModelProperty(value="省市区分类id",example="省1,市2,区3")//上级id
 	private Integer type;
 	private Integer type;
 	
 	
 	@ApiModelProperty(value="省市区籍贯id",example="110000")
 	@ApiModelProperty(value="省市区籍贯id",example="110000")
@@ -46,5 +46,9 @@ public class YgjgDto implements Serializable{
 	@TableField(exist = false)
 	@TableField(exist = false)
 	private String jgname;
 	private String jgname;
 	
 	
+	@Transient
+	@TableField(exist = false)
+	private List<YgjgDto> ygjgDtoList;
+	
 	
 	
 }
 }