fix: eq null

OrdinaryRoad-Project · Jul 16, 2024 · 9fd1cf9 · 9fd1cf9
1 parent 60fa090
commit 9fd1cf9
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 1 deletion.
diff --git a/...ms/ordinaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysDictService.java b/...ms/ordinaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysDictService.java
@@ -62,12 +62,18 @@ public Optional<SysDictDO> findByUniqueColumn(@NotNull SysDictDO sysDictDO) {
     }
 
     public Optional<SysDictDO> findByDictName(String dictName) {
+        if (dictName == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysDictDO::getDictName, dictName)
                 .one();
     }
 
     public Optional<SysDictDO> findByDictCode(String dictCode) {
+        if (dictCode == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysDictDO::getDictCode, dictCode)
                 .one();

diff --git a/...inaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysPermissionService.java b/...inaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysPermissionService.java
@@ -58,6 +58,9 @@ public class SysPermissionService extends BaseService<SysPermissionDAO, SysPermi
     private SysRequestPathService sysRequestPathService;
 
     public Optional<SysPermissionDO> findByPermissionCode(String permissionCode) {
+        if (permissionCode == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysPermissionDO::getPermissionCode, permissionCode)
                 .one();

diff --git a/...naryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysRequestPathService.java b/...naryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysRequestPathService.java
@@ -53,12 +53,18 @@ public class SysRequestPathService extends BaseService<SysRequestPathDAO, SysReq
     private SysRolesPermissionsService sysRolesPermissionsService;
 
     public Optional<SysRequestPathDO> findByPath(String path) {
+        if (path == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysRequestPathDO::getPath, path)
                 .one();
     }
 
     public Optional<SysRequestPathDO> findByPathName(String pathName) {
+        if  (pathName==null){
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysRequestPathDO::getPathName, pathName)
                 .one();

diff --git a/...ms/ordinaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysRoleService.java b/...ms/ordinaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysRoleService.java
@@ -50,12 +50,18 @@ public class SysRoleService extends BaseService<SysRoleDAO, SysRoleDO> {
     private SysUsersRolesService sysUsersRolesService;
 
     public Optional<SysRoleDO> findByRoleName(String roleName) {
+        if (roleName == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysRoleDO::getRoleName, roleName)
                 .one();
     }
 
     public Optional<SysRoleDO> findByRoleCode(String roleCode) {
+        if (roleCode == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysRoleDO::getRoleCode, roleCode)
                 .one();

diff --git a/...oad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysRolesPermissionsService.java b/...oad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysRolesPermissionsService.java
@@ -62,6 +62,9 @@ public List<SysRolesPermissionsDO> findAllByPermissionUuids(List<String> permiss
     }
 
     public Optional<SysRolesPermissionsDO> findByRoleUuidAndPermissionUuid(String roleUuid, String permissionUuid) {
+        if (roleUuid == null || permissionUuid == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysRolesPermissionsDO::getRoleUuid, roleUuid)
                 .eq(SysRolesPermissionsDO::getPermissionUuid, permissionUuid)

diff --git a/...ms/ordinaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysUserService.java b/...ms/ordinaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysUserService.java
@@ -51,20 +51,29 @@ public class SysUserService extends BaseService<SysUserDAO, SysUserDO> {
 
     @Cacheable(cacheNames = CacheConstants.CACHEABLE_CACHE_NAME_USER_BY_EMAIL, key = "'" + CacheConstants.CACHEABLE_KEY_USER + "' + #email")
     public Optional<SysUserDO> findByEmail(String email) {
+        if (email == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysUserDO::getEmail, email)
                 .one();
     }
 
     @Cacheable(cacheNames = CacheConstants.CACHEABLE_CACHE_NAME_USER_BY_USERNAME, key = "'" + CacheConstants.CACHEABLE_KEY_USER + "' + #username")
     public Optional<SysUserDO> findByUsername(String username) {
+        if (username == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysUserDO::getUsername, username)
                 .one();
     }
 
     @Cacheable(cacheNames = CacheConstants.CACHEABLE_CACHE_NAME_USER_BY_OR_NUMBER, key = "'" + CacheConstants.CACHEABLE_KEY_USER + "' + #orNumber")
     public Optional<SysUserDO> findByOrNumber(String orNumber) {
+        if (orNumber == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysUserDO::getOrNumber, orNumber)
                 .one();

diff --git a/...inaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysUsersRolesService.java b/...inaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/service/SysUsersRolesService.java
@@ -26,6 +26,7 @@
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import io.mybatis.mapper.example.ExampleWrapper;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 import tech.ordinaryroad.commons.core.base.request.query.BaseQueryRequest;
 import tech.ordinaryroad.commons.mybatis.service.BaseService;
@@ -44,12 +45,18 @@
 public class SysUsersRolesService extends BaseService<SysUsersRolesDAO, SysUsersRolesDO> {
 
     public List<SysUsersRolesDO> findAllByUserUuid(String userUuid) {
+        if (userUuid == null) {
+            return Lists.newArrayList();
+        }
         return dao.wrapper()
                 .eq(SysUsersRolesDO::getUserUuid, userUuid)
                 .list();
     }
 
     public List<SysUsersRolesDO> findAllByRoleUuid(String roleUuid) {
+        if (roleUuid == null) {
+            return Lists.newArrayList();
+        }
         return dao.wrapper()
                 .eq(SysUsersRolesDO::getRoleUuid, roleUuid)
                 .list();
@@ -65,6 +72,9 @@ public List<SysUsersRolesDO> findAllByRoleUuids(List<String> roleUuids) {
     }
 
     public Optional<SysUsersRolesDO> findByUserUuidAndRoleUuid(String userUuid, String roleUuid) {
+        if (userUuid == null || roleUuid == null) {
+            return Optional.empty();
+        }
         return dao.wrapper()
                 .eq(SysUsersRolesDO::getUserUuid, userUuid)
                 .eq(SysUsersRolesDO::getRoleUuid, roleUuid)

diff --git a/...inaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/web/controller/SysController.java b/...inaryroad-upms-web/src/main/java/tech/ordinaryroad/upms/web/controller/SysController.java
@@ -82,10 +82,13 @@ public Result<SysUserInfoDTO> userInfo(@RequestBody(required = false) SysUserInf
             }
             orNumber = (String) StpUtil.getLoginIdByToken(tokenValue);
         }
+        if (StrUtil.isBlank(orNumber)) {
+            return Result.fail(StatusCode.USER_ACCOUNT_NOT_EXIST);
+        }
 
         // 获取User
         Optional<SysUserDO> optionalSysUserDO = sysUserService.findByOrNumber(orNumber);
-        if (!optionalSysUserDO.isPresent()) {
+        if (optionalSysUserDO.isEmpty()) {
             return Result.fail(StatusCode.USER_ACCOUNT_NOT_EXIST);
         }
         SysUserDO sysUserDO = optionalSysUserDO.get();