jiangjiazhi / regional-platform

Authored by hanshaofeng over 8 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 21 additions and 0 deletions

...	...	@@ -67,6 +67,19 @@
67	67	private String foreignId;
68	68
69	69	private String roleStr;
	70	+ /*
	71	+ 多个区域，省市区乡如果为0代表全部，省不可为0
	72	+ [{"p":"1","c":"2","a":"3","s":"4"},{"p":"2","c":"0","a":"0","s":"0"}]
	73	+ */
	74	+ private String areaPermission;
	75	+
	76	+ public String getAreaPermission() {
	77	+ return areaPermission;
	78	+ }
	79	+
	80	+ public void setAreaPermission(String areaPermission) {
	81	+ this.areaPermission = areaPermission;
	82	+ }
70	83
71	84	public String getRoleStr() {
72	85	return roleStr;

...	...	@@ -108,6 +108,9 @@
108	108	user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
109	109	List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(user.getId());
110	110	user.setOrganizations(accessPermissionFacade.getOrganization(permissionsModelList));
	111	+ if (permissionsModelList != null && permissionsModelList.size() > 0) {
	112	+ user.setAreaPermission(permissionsModelList.get(0).getAreaPermission());
	113	+ }
111	114	}
112	115
113	116	FrontEndResult frontEndResult = new FrontEndResult();
...	...	@@ -205,6 +208,11 @@
205	208	user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
206	209	if(null!=user.getZhiChenId()){
207	210	user.setZhiChen(ZhiChenEnums.getById(user.getZhiChenId()));
	211	+ }
	212	+ List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(user.getId());
	213	+ user.setOrganizations(accessPermissionFacade.getOrganization(permissionsModelList));
	214	+ if (permissionsModelList != null && permissionsModelList.size() > 0) {
	215	+ user.setAreaPermission(permissionsModelList.get(0).getAreaPermission());
208	216	}
209	217	// user.setPwd(StringUtils.isEmpty(user.getPwd())?user.getPwd():user.getPwd().replaceAll(".","*"));
210	218	user.setPwd(replacePwd);