Merge branch 'develop' of

http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc

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

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