Bladeren bron

增加部分判断

xda 3 jaren geleden
bovenliggende
commit
e547b5bf5b

+ 8 - 1
src/main/java/com/winhc/repal/config/MvcConfigurer.java

@@ -16,6 +16,13 @@ public class MvcConfigurer implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // open接口在单独的controller
-        registry.addInterceptor(new UserContextInterceptor()).excludePathPatterns("/open**/**").order(0);
+        registry.addInterceptor(new UserContextInterceptor())
+                .addPathPatterns("/**")
+                .excludePathPatterns("/open*/**")
+                .excludePathPatterns("/swagger-ui/**")
+                .excludePathPatterns("/swagger-resources/**")
+                .excludePathPatterns("/api/**","/v2/**", "/v3/**")
+                .order(0);
     }
+
 }

+ 4 - 0
src/main/java/com/winhc/repal/service/impl/RepalRolePermissionServiceImpl.java

@@ -10,6 +10,7 @@ import com.winhc.repal.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -38,6 +39,9 @@ public class RepalRolePermissionServiceImpl extends ServiceImpl<RepalRolePermiss
         Set<String> codeSet = redisUtil.setMembers(Constant.USER_PERMISSION_KEY + userId);
         if (CollUtil.isEmpty(codeSet)) {
             codeSet = repalRolePermissionMapper.getUserPermissionCodeSet(userId);
+            if (CollUtil.isEmpty(codeSet)) {
+                return new HashSet<>();
+            }
             processUserPermissionCache(userId, codeSet);
         }
         return codeSet;

+ 1 - 1
src/main/resources/mapper/RepalBillMapper.xml

@@ -60,7 +60,7 @@
             <if test="param2.dynamicType == 4">
                 his.REMIND_TYPE = 'OVERDUE' AND his.id > ri.OVERDUE_REMIND_ID
             </if>
-            and his.REPAL_BILL_ID = bill.ID)
+            AND his.REPAL_BILL_ID = bill.ID)
         </if>
         </where>
         <if test="param2.sortedType != null">

+ 7 - 5
src/test/java/com/winhc/repal/WinhcReceivablesApplicationTests.java

@@ -1,23 +1,25 @@
 package com.winhc.repal;
 
+import com.winhc.repal.service.RepalRolePermissionService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.Resource;
+import java.util.HashSet;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class WinhcReceivablesApplicationTests {
 
-
+    @Resource
+    private RepalRolePermissionService repalRolePermissionService;
 
     @Test
     public void contextLoads() {
-
     }
 
-    @Test
-    public void contextLoads2() {
-    }
+
 
 }