1.删除错误盘空

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/core/framework/PersonIdentifyAspect.java

@@ -39,19 +39,15 @@ public class PersonIdentifyAspect {
         if (permission.isNeedIdentity() && reginParam != null) {
             String userId = reginParam.getUserModel().getUserId();
             UserDto userDto = orgUsrService.getUserParentInfo(userId);
-            if (!ObjectUtils.isEmpty(userDto)) {
-                ReginParams.PersonIdentity personIdentity = new ReginParams.PersonIdentity();
-                personIdentity.setBizOrgCode(userDto.getBizOrgCode());
-                personIdentity.setCompanyId(userDto.getCompanyId());
-                personIdentity.setCompanyName(userDto.getCompanyName());
-                personIdentity.setPersonSeq(userDto.getPersonSeq());
-                personIdentity.setPersonName(userDto.getPersonName());
-                personIdentity.setIdentityType(userDto.getIdentityType());
-                reginParam.setPersonIdentity(personIdentity);
-                redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
-            } else {
-                throw new RuntimeException("人员未绑定！");
-            }
+            ReginParams.PersonIdentity personIdentity = new ReginParams.PersonIdentity();
+            personIdentity.setBizOrgCode(userDto.getBizOrgCode());
+            personIdentity.setCompanyId(userDto.getCompanyId());
+            personIdentity.setCompanyName(userDto.getCompanyName());
+            personIdentity.setPersonSeq(userDto.getPersonSeq());
+            personIdentity.setPersonName(userDto.getPersonName());
+            personIdentity.setIdentityType(userDto.getIdentityType());
+            reginParam.setPersonIdentity(personIdentity);
+            redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2049,23 +2049,25 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
     @Override
     public UserDto getUserParentInfo(String userId) {
-        UserDto userDto = new UserDto();
-        if (StringUtils.isNotEmpty(userId)) {
-            OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.parseLong(userId));
-            if (!ObjectUtils.isEmpty(orgUsr)) {
-                String parentId = orgUsr.getParentId();
-                userDto.setPersonSeq(String.valueOf(orgUsr.getSequenceNbr()));
-                userDto.setPersonName(orgUsr.getBizOrgName());
-                OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(parentId);
-                if (!ObjectUtils.isEmpty(bizOrg)) {
-                    userDto.setBizOrgType(bizOrg.getBizOrgType());
-                    userDto.setBizOrgCode(bizOrg.getBizOrgCode());
-                    userDto.setCompanyId(String.valueOf(bizOrg.getSequenceNbr()));
-                    userDto.setCompanyName(bizOrg.getBizOrgName());
-                }
+        OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.parseLong(userId));
+        if (null != orgUsr) {
+            UserDto userDto = new UserDto();
+            String parentId = orgUsr.getParentId();
+            userDto.setPersonSeq(String.valueOf(orgUsr.getSequenceNbr()));
+            userDto.setPersonName(orgUsr.getBizOrgName());
+            OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(parentId);
+            if (!ObjectUtils.isEmpty(bizOrg)) {
+                userDto.setBizOrgType(bizOrg.getBizOrgType());
+                userDto.setBizOrgCode(bizOrg.getBizOrgCode());
+                userDto.setCompanyId(String.valueOf(bizOrg.getSequenceNbr()));
+                userDto.setCompanyName(bizOrg.getBizOrgName());
+            } else {
+                throw new RuntimeException("人员所在公司不存在");
             }
+            return userDto;
+        } else {
+            throw new RuntimeException("人员未绑定");
         }
-        return userDto;
     }