[dev] fix getCurrentAuditor retrun optional

atms-api/src/main/java/pwc/taxtech/atms/common/AuthUserHelper.java

 package pwc.taxtech.atms.common;
 
+import java.util.Optional;
+
 public interface AuthUserHelper {
 
-    String getCurrentAuditor();
+    Optional<String> getCurrentAuditor();
 
     String getCurrentUserId();
 

atms-api/src/main/java/pwc/taxtech/atms/common/AuthUserHelperImpl.java

@@ -17,6 +17,7 @@ import pwc.taxtech.atms.exception.ApplicationException;
 import pwc.taxtech.atms.security.JwtUser;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Optional;
 
 @Component
 public class AuthUserHelperImpl implements AuditorAware<String>, AuthUserHelper {
@@ -33,7 +34,7 @@ public class AuthUserHelperImpl implements AuditorAware<String>, AuthUserHelper
      * @see pwc.taxtech.atms.common.AuthUserHelper#getCurrentAuditor()
      */
     @Override
-    public String getCurrentAuditor() {
+    public Optional<String> getCurrentAuditor() {
         SecurityContext context = SecurityContextHolder.getContext();
         if (context == null) {
             throw new ApplicationException("security context is null");
@@ -46,7 +47,7 @@ public class AuthUserHelperImpl implements AuditorAware<String>, AuthUserHelper
         if (Strings.isEmpty(result)) {
             throw new ApplicationException("failed to get user name from authentication");
         }
-        return result;
+        return Optional.of(result);
     }
 
     /*

atms-api/src/main/java/pwc/taxtech/atms/service/impl/AreaRegionServiceImpl.java

@@ -165,7 +165,7 @@ public class AreaRegionServiceImpl implements pwc.taxtech.atms.service.AreaRegio
             updateLogParams.setOperationContent("");
             updateLogParams.setOriginalState(originalArea);
             updateLogParams.setUpdateState(updateToArea);
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setOperationObject(updateToArea.getName());
             updateLogParams.setOperationAction(OperationAction.Update.value());
             operationLogService.updateDataAddLog(updateLogParams);

atms-api/src/main/java/pwc/taxtech/atms/service/impl/AreaServiceImpl.java

@@ -149,7 +149,7 @@ public class AreaServiceImpl implements AreaService {
             // OperationLog
             operationLogDto = new OperationLogDto();
             operationLogDto.setId(CommonUtils.getUUID());
-            operationLogDto.setOperationUser(authUserHelper.getCurrentAuditor());
+            operationLogDto.setOperationUser(authUserHelper.getCurrentAuditor().get());
             operationLogDto.setIp("");
             operationLogDto.setOperationContent(LogMessage.IsActive);
             operationLogDto.setAction(OperationAction.Update.value());

atms-api/src/main/java/pwc/taxtech/atms/service/impl/BusinessUnitServiceImpl.java

@@ -159,7 +159,7 @@ public class BusinessUnitServiceImpl implements BusinessUnitService {
                 updateLogParams.setOperationObject(originBusinessUnit.getName());
                 updateLogParams.setOriginalState(originBusinessUnit);
                 updateLogParams.setUpdateState(businessUnit);
-                updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+                updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
                 updateLogParams.setOperationModule(OperationModule.BasicDataBusinessUnit.value());
                 updateLogParams.setOperationAction(OperationAction.Update.value());
                 updateLogParams.setOperateLogType(OperateLogType.OperationLogBasicData.value());

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CustomerServiceImpl.java

@@ -202,7 +202,7 @@ public class CustomerServiceImpl implements CustomerService {
                     customerDto.getCode() + CommonConstants.PLUS_SIGN_SEPARATOR + customerDto.getName());
             updateLogParams.setOriginalState(originCustomer);
             updateLogParams.setUpdateState(existedCustomer);
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setOperationModule(OperationModule.BasicDataCustomer.value());
             updateLogParams.setComment(getAccountNameById(customerDto.getEnterPriseAccountId()));
             updateLogParams.setOperationAction(OperationAction.Update.value());

atms-api/src/main/java/pwc/taxtech/atms/service/impl/EnterpriseAccountServiceImpl.java

@@ -232,7 +232,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
         EnterpriseAccountSet enterpriseAccountSet = enterpriseAccountSetMapper.selectByPrimaryKey(enterpriseAccountDto.getEnterpriseAccountSetId());
         //add operational log
         UpdateLogParams updateLogParams = new UpdateLogParams();
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setUpdateState("");
         updateLogParams.setOriginalState("");
         updateLogParams.setOperationContent(enterpriseAccountDto.getCode() + " " + enterpriseAccountDto.getName());
@@ -342,7 +342,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
         EnterpriseAccountSet enterpriseAccountSet = enterpriseAccountSetMapper.selectByPrimaryKey(enterpriseAccountDto.getEnterpriseAccountSetId());
         //operation log
         UpdateLogParams updateLogParams = new UpdateLogParams();
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setUpdateState(getEnterpriseAccountInfo(entityToUpdate));
         updateLogParams.setOriginalState(getEnterpriseAccountInfo(entityCopy));
         updateLogParams.setOperationContent(enterpriseAccountDto.getCode() + " " + enterpriseAccountDto.getName());
@@ -527,7 +527,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
         
         //create operationlog for creating enterprise account set
         UpdateLogParams updateLogParams = new UpdateLogParams();
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setUpdateState("");
         updateLogParams.setOriginalState("");
         updateLogParams.setOperationContent("");
@@ -991,7 +991,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
                 manual.setStandardCode(stdAccount.getCode());
                 manual.setOrganizationId(organization.getId());
                 manual.setEnterpriseAccountSetId(accountSetId);
-                manual.setUpdateBy(authUserHelper.getCurrentAuditor());
+                manual.setUpdateBy(authUserHelper.getCurrentAuditor().get());
                 manual.setUpdateTime(new Date());
                 addManualMappingRecord(manual);
                 //endregion
@@ -1135,7 +1135,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
                 manual.setOrganizationId(orgId);
                 manual.setEnterpriseAccountSetId(accountSetId);
                 manual.setIndustryId(industryId);
-                manual.setUpdateBy(authUserHelper.getCurrentAuditor());
+                manual.setUpdateBy(authUserHelper.getCurrentAuditor().get());
                 manual.setUpdateTime(new Date());
                 addManualMappingRecord(manual);
                 //endregion
@@ -1577,7 +1577,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
             updateLogParams.setOriginalState(parentNodeOriginal);
             updateLogParams.setUpdateState(parentNode);
             updateLogParams.setOperationModule(OperationModule.BasicDataEnterpriceAccount.value());
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setComment(LogMessage.EnterpriceAccountImportUpdate);
             updateLogParams.setOperationObject(parentNodeOriginal.getName());
             updateLogParams.setOperationContent("operation content");
@@ -1625,7 +1625,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
             updateLogParams.setOriginalState(parentNodeOriginal);
             updateLogParams.setUpdateState(parentNodeEntity);
             updateLogParams.setOperationModule(OperationModule.BasicDataEnterpriceAccount.value());
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setComment(LogMessage.EnterpriceAccountImportUpdate);
             updateLogParams.setOperationObject(parentNodeOriginal.getName());
             updateLogParams.setOperationContent("operation content");

atms-api/src/main/java/pwc/taxtech/atms/service/impl/EnterpriseAccountSetServiceImpl.java

@@ -150,7 +150,7 @@ public class EnterpriseAccountSetServiceImpl implements EnterpriseAccountSetServ
         if(isChangeEnterpriseAccountSetName || isChangeEnterpriseAccountSetCode) {
             
             UpdateLogParams updateLogParams = new UpdateLogParams();
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setUpdateState(updateToEntity);
             updateLogParams.setOriginalState(entity);
             updateLogParams.setOperationContent("");
@@ -326,7 +326,7 @@ public class EnterpriseAccountSetServiceImpl implements EnterpriseAccountSetServ
         List<UpdateLogParams> updateLogParamsList = new ArrayList<>();
         for(EnterpriseAccountSetOrgDto enterpriseAccountSetOrgDto : enterpriseAccountSetOrgDtoList) {
             UpdateLogParams updateLogParams = new UpdateLogParams();
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setUpdateState("");
             updateLogParams.setOriginalState("");
             updateLogParams.setOperationContent(enterpriseAccountSetOrgDto.getOrganizationName());
@@ -386,7 +386,7 @@ public class EnterpriseAccountSetServiceImpl implements EnterpriseAccountSetServ
         
         //operational log
         UpdateLogParams updateLogParams = new UpdateLogParams();
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setOperationObject(enterpriseAccountSetOrgDto.getEnterpriseAccountSetName());
         updateLogParams.setOperationModule(OperationModule.BasicDataEnterpriceAccount.value());
         updateLogParams.setOperateLogType(OperateLogType.OperationLogEnterPrise.value());
@@ -434,7 +434,7 @@ public class EnterpriseAccountSetServiceImpl implements EnterpriseAccountSetServ
         List<UpdateLogParams> updateLogParamsList = new ArrayList<>();
         for(EnterpriseAccountSetOrgDto enterpriseAccountSetOrgDto : enterpriseAccountSetOrgDtoList) {
             UpdateLogParams updateLogParams = new UpdateLogParams();
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setUpdateState("");
             updateLogParams.setOriginalState("");
             updateLogParams.setOperationContent(enterpriseAccountSetOrgDto.getOrganizationName());

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OperationLogServiceImpl.java

@@ -57,7 +57,7 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
 
 		record.setId(CommonUtils.getUUID());
 		record.setIp(authUserHelper.getClientIp());
-		record.setOperationUser(authUserHelper.getCurrentAuditor());
+		record.setOperationUser(authUserHelper.getCurrentAuditor().get());
 		record.setCreateTime(new Date());
 
 		record.setOperationContent(operationLogDto.getOperationContent());

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationStructureServiceImpl.java

@@ -164,7 +164,7 @@ public class OrganizationStructureServiceImpl implements OrganizationStructureSe
                 updateLogParams.setOperationObject(originOrganizationStructure.getName());
                 updateLogParams.setOriginalState(originOrganizationStructure);
                 updateLogParams.setUpdateState(organizationStructure);
-                updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+                updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
                 updateLogParams.setOperationModule(OperationModule.BasicDataOrganizationStructure.value());
                 updateLogParams.setOperationAction(OperationAction.Update.value());
                 updateLogParams.setOperateLogType(OperateLogType.OperationLogBasicData.value());

atms-api/src/main/java/pwc/taxtech/atms/service/impl/RoleServiceImpl.java

@@ -1003,7 +1003,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
             // operation log
             UpdateLogParams updateLogParams = new UpdateLogParams();
             updateLogParams.setOperationModule(OperationModule.Role.value());
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setOperationContent(user.getUserName());
             updateLogParams.setOperationObject(role.getName());
             updateLogParams.setOperationAction(OperationAction.New.value());
@@ -1035,7 +1035,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
             User user = userMapper.selectByPrimaryKey(userId);
             Role role = roleMapper.selectByPrimaryKey(roleId);
             updateLogParams.setOperationModule(OperationModule.Role.value());
-            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             updateLogParams.setOperationContent(user == null ? "" : user.getUserName());
             updateLogParams.setOperationObject(role == null ? "" : role.getName());
             updateLogParams.setOperationAction(OperationAction.DeleteUser.value());
@@ -1096,7 +1096,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
         // operation log
         UpdateLogParams updateLogParams = new UpdateLogParams();
         updateLogParams.setOperationModule(OperationModule.Role.value());
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setOperationContent("");
         updateLogParams.setOperationObject(roleCategoryName);
         updateLogParams.setOperationAction(OperationAction.New.value());
@@ -1133,7 +1133,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
         updateLogParams.setOperationObject(roleCategoryOriginal.getName());
         updateLogParams.setOriginalState(roleCategoryOriginal);
         updateLogParams.setUpdateState(roleCategoryToUpdate);
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setOperationModule(OperationModule.Role.value());
         updateLogParams.setComment("");
         updateLogParams.setOperationAction(OperationAction.Update.value());
@@ -1168,7 +1168,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
         // operation log
         UpdateLogParams updateLogParams = new UpdateLogParams();
         updateLogParams.setOperationModule(OperationModule.Role.value());
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setOperationContent("");
         updateLogParams.setOperationObject(roleCategoryToDelete.getName());
         updateLogParams.setOperationAction(OperationAction.Delete.value());
@@ -1208,7 +1208,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
         // operation log for add role
         UpdateLogParams updateLogParams = new UpdateLogParams();
         updateLogParams.setOperationModule(OperationModule.Role.value());
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setOperationContent("");
         updateLogParams.setOperationObject(roleToAdd.getName());
         updateLogParams.setOperationAction(OperationAction.New.value());
@@ -1233,7 +1233,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
                 // 增加权限日志
                 UpdateLogParams permissionLogParams = new UpdateLogParams();
                 permissionLogParams.setOperationModule(OperationModule.Role.value());
-                permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+                permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
                 permissionLogParams.setOperationContent(permission.getName());
                 permissionLogParams.setOperationObject(roleToAdd.getName());
                 permissionLogParams.setOperationAction(OperationAction.AddNewPermission.value());
@@ -1277,7 +1277,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
         updateRoleLogParams.setOperationObject(roleOriginal.getName());
         updateRoleLogParams.setOriginalState(roleOriginal);
         updateRoleLogParams.setUpdateState(roleToUpdate);
-        updateRoleLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateRoleLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateRoleLogParams.setOperationModule(OperationModule.Role.value());
         updateRoleLogParams.setComment("");
         updateRoleLogParams.setOperationAction(OperationAction.Update.value());
@@ -1315,7 +1315,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
 
             UpdateLogParams permissionLogParams = new UpdateLogParams();
             permissionLogParams.setOperationModule(OperationModule.Role.value());
-            permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             permissionLogParams.setOperationContent(permission.getName());
             permissionLogParams.setOperationObject(roleOriginal.getName());
             permissionLogParams.setOperationAction(OperationAction.Delete.value());
@@ -1338,7 +1338,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
 
             UpdateLogParams permissionLogParams = new UpdateLogParams();
             permissionLogParams.setOperationModule(OperationModule.Role.value());
-            permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+            permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
             permissionLogParams.setOperationContent(permission.getName());
             permissionLogParams.setOperationObject(roleOriginal.getName());
             permissionLogParams.setOperationAction(OperationAction.New.value());
@@ -1394,7 +1394,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
         // operation log
         UpdateLogParams permissionLogParams = new UpdateLogParams();
         permissionLogParams.setOperationModule(OperationModule.Role.value());
-        permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         permissionLogParams.setOperationContent(roleDto.getName());
         permissionLogParams.setOperationObject(roleDto.getName());
         permissionLogParams.setOperationAction(OperationAction.Delete.value());

atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserAccountServiceImpl.java

@@ -76,7 +76,7 @@ public class UserAccountServiceImpl extends AbstractService implements UserAccou
     @Override
     public OperationResultDto<LoginOutputDto> changeExternalUserPassword(UserPasswordDto userPasswordDto) {
         logger.debug("修改密码 Start");
-        final String userName = authUserHelper.getCurrentAuditor();
+        final String userName = authUserHelper.getCurrentAuditor().get();
 
         // find exist user
         User tempUser = userMapper.selectByUserNameIgnoreCase(userName);
@@ -291,7 +291,7 @@ public class UserAccountServiceImpl extends AbstractService implements UserAccou
 
     @Override
     public OperationResultDto<User> addUser(UserAndUserRoleSaveDto userAndUserRoleSaveDto) {
-        String userName = authUserHelper.getCurrentAuditor();
+        String userName = authUserHelper.getCurrentAuditor().get();
         OperationResultDto<User> operationResultDto = new OperationResultDto<>();
         OperationResultDto<User> result = userService.checkUserExist(userAndUserRoleSaveDto.getUserName(),
                 CommonConstants.EMPTY_UUID);

atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserRoleServiceImpl.java

@@ -767,7 +767,7 @@ public class UserRoleServiceImpl extends AbstractService implements UserRoleServ
         updateLogParams.setOriginalState(originalObj);
         updateLogParams.setOperationContent(operationContent);
         updateLogParams.setUpdateState(updateObj);
-        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
+        updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
         updateLogParams.setOperationModule(operationModule);
         updateLogParams.setOperationAction(OperationAction.Update.value());
         updateLogParams.setOperateLogType(logType);

atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserServiceImpl.java

@@ -702,7 +702,7 @@ public class UserServiceImpl extends AbstractService implements UserService {
         User user = userMapper.selectByPrimaryKey(userDto.getId());
         Assert.notNull(user, "Null user");
         if (!Objects.equals(userDto.getIsAdmin(), BooleanUtils.isTrue(user.getIsAdmin()))) {
-            String userName = authUserHelper.getCurrentAuditor();
+            String userName = authUserHelper.getCurrentAuditor().get();
             User operateUser = userMapper.selectByUserNameIgnoreCase(userName);
             if (operateUser != null && BooleanUtils.isFalse(operateUser.getIsAdmin())) {
                 operationResultDto.setResult(false);