tzs中使用逻辑调整

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/config/PersonIdentifyAspect.java

@@ -60,18 +60,19 @@ public class PersonIdentifyAspect {
                 String userId = reginParam.getUserModel().getUserId();
 
                 if (userId != null) {
-                    FeignClientResult responseModel = jcsFeignClient.selectById(userId);
-
-
-                    if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
-                        throw new RuntimeException(responseModel.getDevMessage());
-                    }
-                    String s = JSONObject.toJSONString(responseModel.getResult());
-                    ReginParams.PersonIdentity personIdentity = JSONObject.parseObject(s, ReginParams.PersonIdentity.class);
+//                    FeignClientResult responseModel = jcsFeignClient.selectById(userId);
+//
+//
+//                    if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
+//                        throw new RuntimeException(responseModel.getDevMessage());
+//                    }
+//                    String s = JSONObject.toJSONString(responseModel.getResult());
+//                    ReginParams.PersonIdentity personIdentity = JSONObject.parseObject(s, ReginParams.PersonIdentity.class);
+                    ReginParams.PersonIdentity personIdentity = new ReginParams.PersonIdentity();
                     //    ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
                     //电力默认走公司权限
-                    if (!logic){
-                        personIdentity.setBizOrgCode(StringUtils.isEmpty(personIdentity.getCompanyBizOrgCode()) ? "-1" : personIdentity.getCompanyBizOrgCode());
+                    if (!logic) {
+                        personIdentity.setBizOrgCode(StringUtils.isEmpty(reginParam.getCompany().getOrgCode()) ? "-1" : reginParam.getCompany().getOrgCode());
                     }
 
                     reginParam.setPersonIdentity(personIdentity);