拉黑列表

alien-store/src/main/java/shop/alien/store/controller/LifeBlacklistController.java

@@ -70,7 +70,7 @@ public class LifeBlacklistController {
     @GetMapping("/blackListByUserId")
     public R<List<LifeBlacklistVo>> blackListByUserId(@RequestParam(value = "userType") String userType,
                                                       @RequestParam(value = "userId") String userId,
-                                                      @RequestParam(value = "type") Integer type) {
+                                                      @RequestParam(required = false, value = "type") Integer type) {
         return R.data(lifeBlacklistService.blackListByUserId(userType, userId, type));
     }
 

alien-store/src/main/java/shop/alien/store/service/impl/LifeBlacklistServiceImpl.java

@@ -92,6 +92,9 @@ public class LifeBlacklistServiceImpl extends ServiceImpl<LifeBlacklistMapper, L
             wrapper.eq(LifeBlacklist::getBlockedType, "1");
         } else if (2 == type) {
             wrapper.eq(LifeBlacklist::getBlockedType, "2");
+        }else{
+            //type == 0 查询拉黑商户和用户
+            wrapper.in(LifeBlacklist::getBlockedType,"1","2");
         }
         wrapper.orderByDesc(LifeBlacklist::getCreatedTime);
         List<LifeBlacklist> lifeBlacklists = lifeBlacklistMapper.selectList(wrapper);