更改了籍贯null

src/main/java/cn/timer/api/controller/htzz/HtzzController.java

@@ -79,7 +79,7 @@ public class HtzzController {
 		List<HtzzAssoHtgx> htgxs = new ArrayList<HtzzAssoHtgx>(ids.length);
 		List<HtzzAssoHtgx> htgxs = new ArrayList<HtzzAssoHtgx>(ids.length);
 		for (Integer id : ids) {
 		for (Integer id : ids) {
 			QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
 			QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
-			queryWrapper.select("name", "phone", "emp_num").eq("emp_num", id);
+			queryWrapper.select("name", "phone", "emp_num").eq("emp_num", id).eq("org_code", userBean.getOrgCode());
 			emp = YgglMainEmp.builder().build().selectOne(queryWrapper);
 			emp = YgglMainEmp.builder().build().selectOne(queryWrapper);
 
 
 			HtzzAssoHtgx htgx = HtzzAssoHtgx.builder().build();
 			HtzzAssoHtgx htgx = HtzzAssoHtgx.builder().build();
@@ -155,7 +155,6 @@ public class HtzzController {
 		List<Object> list = new ArrayList<Object>();
 		List<Object> list = new ArrayList<Object>();
 		list.add(HtzzAdminZzda.builder().build().selectOne(new QueryWrapper<HtzzAdminZzda>()
 		list.add(HtzzAdminZzda.builder().build().selectOne(new QueryWrapper<HtzzAdminZzda>()
 				.eq("org_code", userBean.getOrgCode()).eq("is_delete", 0).eq("id", id)));
 				.eq("org_code", userBean.getOrgCode()).eq("is_delete", 0).eq("id", id)));
-
 		QueryWrapper<HtzzAssoHtgx> q = new QueryWrapper<HtzzAssoHtgx>();
 		QueryWrapper<HtzzAssoHtgx> q = new QueryWrapper<HtzzAssoHtgx>();
 		q.select("id", "name").eq("htid", id);
 		q.select("id", "name").eq("htid", id);
 		List<HtzzAssoHtgx> htgx = HtzzAssoHtgx.builder().build().selectList(q);
 		List<HtzzAssoHtgx> htgx = HtzzAssoHtgx.builder().build().selectList(q);

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

@@ -1426,12 +1426,13 @@ public class YgglController {
 		Integer type = ygjgDto.getType();
 		Integer type = ygjgDto.getType();
 		Integer upId = ygjgDto.getJgid();
 		Integer upId = ygjgDto.getJgid();
 		List<YgjgDto> maps = new ArrayList<YgjgDto>();
 		List<YgjgDto> maps = new ArrayList<YgjgDto>();
+		YgjgDto map = YgjgDto.builder().build();
 		
 		
-		Map<Integer, String> map = new HashMap<Integer, String>();
 		if (type == 1) { //省份
 		if (type == 1) { //省份
 			List<YgProDto> list = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getProvince,YgProDto::getName).orderByAsc(YgProDto::getProvince).list();
 			List<YgProDto> list = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getProvince,YgProDto::getName).orderByAsc(YgProDto::getProvince).list();
 		    for (YgProDto pro : list) {
 		    for (YgProDto pro : list) {
-		    	maps.add(new YgjgDto(pro.getId(), pro.getProvince(), pro.getName()));
+		    	map.setType(pro.getId());map.setJgid(pro.getProvince());map.setJgname(pro.getName());
+		    	maps.add(map);
 		    }}
 		    }}
 		if (type == 2) { //城市
 		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();
 			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();