diff --git a/pom.xml b/pom.xml index f639ec0..9afbe3d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -57,55 +57,55 @@ com.tiesheng.springboot-parent springboot-database - 1.0.20 + 1.0.21 com.tiesheng.springboot-parent springboot-login - 1.0.20 + 1.0.21 com.tiesheng.springboot-parent springboot-web - 1.0.20 + 1.0.21 com.tiesheng.springboot-parent springboot-util - 1.0.20 + 1.0.21 com.tiesheng.springboot-parent springboot-platform - 1.0.20 + 1.0.21 com.tiesheng.springboot-parent springboot-message - 1.0.20 + 1.0.21 com.tiesheng.springboot-parent springboot-encrypt - 1.0.20 + 1.0.21 com.tiesheng.springboot-parent springboot-annotation - 1.0.20 + 1.0.21 com.tiesheng.springboot-parent springboot-poi - 1.0.20 + 1.0.21 diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 039e4a3..400ed2e 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,11 +6,11 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-ademo - 1.0.20 + 1.0.21 8 diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index 63ad632..05d83c6 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-annotation diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index 11388a2..7258d67 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-database diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml index 51fb5cf..9028742 100644 --- a/springboot-encrypt/pom.xml +++ b/springboot-encrypt/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-encrypt diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index d434bd7..a45e2fa 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-login diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index 38721e4..3bb2d1e 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index 9a7d4f7..b409ac7 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-platform diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml index 3a4331b..4d764a3 100644 --- a/springboot-poi/pom.xml +++ b/springboot-poi/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-poi diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index acdb182..dc69d90 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-util diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index 81c7bd8..d736f38 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.0.20 + 1.0.21 springboot-web diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java b/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java index 4e584fb..c4cf1dd 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java +++ b/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java @@ -1,6 +1,6 @@ package com.tiesheng.core.service; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import cn.hutool.core.util.StrUtil; import com.tiesheng.core.mapper.CorePlatformUniqueMapper; import com.tiesheng.core.pojos.dao.CorePlatformUnique; import com.tiesheng.login.config.token.bean.TokenBean; @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.util.Objects; /** * @author hao @@ -37,11 +38,22 @@ public class CorePlatformUniqueService extends TsServiceBase().eq("unique_id", uniqueId) - .set("user_id", userId) - .set("is_deleted", 0) - ); - } - }