jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 5 deletions

...	...	@@ -3344,7 +3344,7 @@
3344	3344	config.put("title", organization.getName());
3345	3345	list.add(config);
3346	3346	}
3347		- String str = HttpClientUtil.doPostSSL("https://dev-app-member-api.healthbaby.com.cn/v1/setOrgAreaUrlConfig", JsonUtil.obj2Str(list));
	3347	+ String str = HttpClientUtil.doPostSSL("https://app-member-api.healthbaby.com.cn/v1/setOrgAreaUrlConfig", JsonUtil.obj2Str(list));
3348	3348	return str;
3349	3349	}
3350	3350

...	...	@@ -435,10 +435,11 @@
435	435	usersQuery.setYn(YnEnums.YES.getId());
436	436	usersQuery.setOrgId(dbuser.getOrgId());
437	437	usersQuery.setEnable(1);
438		-// if (dbuser != null && dbuser.getZhiChenId() == ZhiChenEnums.DOCTOR.getId() && dbuser.getDeptId() != null)
439		-// {
440		-// usersQuery.setDeptId(dbuser.getDeptId());
441		-// }
	438	+ //秦皇岛提出只查询当前用户所在部门的所有用户
	439	+ if (dbuser != null && dbuser.getDeptId() != null)
	440	+ {
	441	+ usersQuery.setDeptId(dbuser.getDeptId());
	442	+ }
442	443	List<Users> users = usersService.queryUsers(usersQuery);
443	444
444	445	if (CollectionUtils.isNotEmpty(users)) {
...	...	@@ -491,6 +492,13 @@
491	492	lis.add(4);
492	493	lis.add(5);
493	494	usersQuery.setZhichenIds(lis);
	495	+
	496	+ //秦皇岛提出只查询当前用户所在部门的所有用户
	497	+ if (dbuser != null && dbuser.getDeptId() != null)
	498	+ {
	499	+ usersQuery.setDeptId(dbuser.getDeptId());
	500	+ }
	501	+
494	502	List<Users> users = usersService.queryUsers(usersQuery);
495	503
496	504	if (CollectionUtils.isNotEmpty(users)) {