Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java

@@ -252,13 +252,10 @@ public class KeySiteController extends BaseController {
         page.setCurrent(current);
         page.setSize(size);
 
-        // 获取登陆人角色
-        ReginParams reginParams = getSelectedOrgInfo();
-        // 权限赋值
-        PermissionInterceptorContext.setDataAuthRule(authKey);
+
 
         return ResponseHelper.buildResponse(keySiteServiceImpl.getPageList(page, name, buildingId, fireEnduranceRate,
-                useNature, fireFacilitiesInfo, reginParams.getPersonIdentity().getBizOrgCode()));
+                useNature, fireFacilitiesInfo, bizOrgCode));
     }
 
 	@PersonIdentify

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -183,10 +183,7 @@ public class OrgPersonController  {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel<Object> listPage(@RequestParam Map<String, Object> requestBody) {
-        // 权限处理
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
            PermissionInterceptorContext.setDataAuthRule(authKey);
-        requestBody.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
 
         return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(
                 requestBody.containsKey("pageNum") ? requestBody.get("pageNum").toString()  :  null ,