fix service list filter bugs

WeBankBlockchain · Oct 30, 2024 · 316ba7c · 316ba7c
1 parent f3a54eb
commit 316ba7c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...on/src/main/java/com/webank/wedpr/components/authorization/service/impl/ParamChecker.java b/...on/src/main/java/com/webank/wedpr/components/authorization/service/impl/ParamChecker.java
@@ -149,7 +149,7 @@ public void checkUpdateAuth(
             updateAuthResult(applicant, authorizationDO, result.get(0), AuthResultStatus.Submit);
         }
         // the cancel case
-        if (authorizationDO.getAuthStatus().cancel()) {
+        if (authorizationDO.getAuthStatus() != null && authorizationDO.getAuthStatus().cancel()) {
             logger.info("The auth {} canceled, record the result", authorizationDO.toString());
             updateAuthResult(applicant, authorizationDO, result.get(0), AuthResultStatus.Cancel);
         }

diff --git a/.../java/com/webank/wedpr/components/db/mapper/service/publish/dao/PublishedServiceInfo.java b/.../java/com/webank/wedpr/components/db/mapper/service/publish/dao/PublishedServiceInfo.java
@@ -67,6 +67,7 @@ public static enum ServiceAuthStatus {
     protected List<ServiceAuthInfo> serviceAuthInfos = new ArrayList<>();
 
     @JsonIgnore protected ServiceStatus serviceStatus;
+    @JsonIgnore protected String loginUser;
 
     public PublishedServiceInfo(String serviceId) {
         this.serviceId = serviceId;

diff --git a/...r-components/db-mapper/service-publish/src/main/resources/mapper/ServicePublishMapper.xml b/...r-components/db-mapper/service-publish/src/main/resources/mapper/ServicePublishMapper.xml
@@ -61,12 +61,12 @@
                 <if test="condition.status!= null and condition.status !=''">
                     and `status` = #{condition.status}
                 </if>
-                <if test="condition.owner!= null and condition.owner !='' and condition.nonOwnerUserFilter == false">
+                <if test="condition.owner!= null and condition.owner !=''">
                     and `owner` = #{condition.owner}
                 </if>
                 <if test="condition.nonOwnerUserFilter!= null and condition.nonOwnerUserFilter == true">
                     and case
-                    when `owner` != #{condition.owner} then `status` not in
+                    when `owner` != #{condition.loginUser} then `status` not in
                         <foreach item="filterStatus" collection="condition.filterStatusList" open="(" close=")" separator=",">
                             #{filterStatus}
                         </foreach>

diff --git a/...va/com/webank/wedpr/components/publish/service/impl/WedprPublishedServiceServiceImpl.java b/...va/com/webank/wedpr/components/publish/service/impl/WedprPublishedServiceServiceImpl.java
@@ -130,7 +130,7 @@ public WeDPRResponse listPublishService(
                         Arrays.asList(
                                 ServiceStatus.Publishing.getStatus(),
                                 ServiceStatus.PublishFailed.getStatus()));
-        request.getCondition().setOwner(user);
+        request.getCondition().setLoginUser(user);
         // the auth setting
         request.getCondition().setAccessibleAgency(agency);
         request.getCondition().setAccessibleUser(user);