Skip to content

A
amos-boot-biz
Commit 13cf6551 authored by maoying's avatar maoying
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents c2548881 b1a33cc8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ 13cf6551
...@@ -715,9 +715,10 @@ public class OrgUsrController extends BaseController { ...@@ -715,9 +715,10 @@ public class OrgUsrController extends BaseController {
@GetMapping(value = "/{companyId}/person/newList") @GetMapping(value = "/{companyId}/person/newList")
public ResponseModel<List<OrgUsr>> getNewPersonListByCompanyId(@PathVariable String companyId) { public ResponseModel<List<OrgUsr>> getNewPersonListByCompanyId(@PathVariable String companyId) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String roleNameString = reginParams.getRole().getRoleName(); String roleNameString = reginParams.getUserModel().getOrgNames();
String currentCompanyId = getCompanyId(reginParams); String currentCompanyId = getCompanyId(reginParams);
if (companyId.equals(currentCompanyId) && roleNameString.contains("Person_charge_unit_fire_protection_supervision_inspection")) {//单位防火监督检查负责人 // if (companyId.equals(currentCompanyId) && roleNameString.contains("Person_charge_unit_fire_protection_supervision_inspection")) {//单位防火监督检查负责人
if ( roleNameString.contains("Person_charge_unit_fire_protection_supervision_inspection")) {//单位防火监督检查负责人
return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId)); return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId));
} }
return null; return null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment