添加超级代理商过滤

bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java

@@ -64,11 +64,14 @@ public class DfBizClueController extends BaseController {
         queryWrapper.orderByDesc(DfBizClue::getBrowseTime);
         boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
         if (!admin) {
+            SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+            if (!sysUser.getDeptId().equals(-1L)) {
                 SysUser byId = userService.getById(SecurityUtils.getUserId());
                 if ("jj".equals(byId.getUserType())) {
                     queryWrapper.eq(DfBizClue::getUserId,SecurityUtils.getUserId());
                 }
             }
+        }
         List<DfBizClue> list = dfBizClueService.list(queryWrapper);
         return getDataTable(list);
     }

bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java

@@ -92,11 +92,14 @@ public class DfOrderController extends BaseController {
         condition(queryWrapper, dfOrder);
         boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
         if (!admin) {
+            SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+            if (!sysUser.getDeptId().equals(-1L)) {
                 SysUser byId = userService.getById(SecurityUtils.getUserId());
                 if ("jj".equals(byId.getUserType())) {
                     queryWrapper.eq(DfOrder::getBrokerId, SecurityUtils.getUserId());
                 }
             }
+        }
         String orderByColumn = dfOrder.getOrderByColumn();
         String isAsc = dfOrder.getIsAsc();
         if (StringUtils.isNotEmpty(orderByColumn) && StringUtils.isNotEmpty(isAsc)) {

bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java

@@ -71,6 +71,7 @@ public class DfProductArticleController extends BaseController {
         LambdaQueryWrapper<DfProductArticle> queryWrapper = new LambdaQueryWrapper();
         boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
         if (!admin) {
+            if (!sysUser.getDeptId().equals(-1L)) {
                 if ("-99".equals(dfProductArticle.getStatus())) {
 
                 } else {
@@ -80,6 +81,7 @@ public class DfProductArticleController extends BaseController {
                     }
                 }
             }
+        }
         if (Validator.isEmpty(dfProductArticle.getOrderByColumn())) {
             queryWrapper.last("ORDER BY CASE WHEN serial_number IS NULL THEN 1 ELSE 0 END, serial_number ASC");
         }

bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java

@@ -134,6 +134,7 @@ public class DfProductInfoController extends BaseController {
             }
         }
         if (!SecurityUtils.isAdmin(sysUser.getUserId())) {
+            if (!sysUser.getDeptId().equals(-1L)) {
                 if (isAnonymous) {
                     List<Long> productIdsByBrokerId = dfBrokerService.getProductIdsByBrokerIdByUserId(sysUser.getUserId());
                     if (productIdsByBrokerId.size() == 0) {
@@ -156,6 +157,7 @@ public class DfProductInfoController extends BaseController {
                     }
                 }
             }
+        }
         startPage();
         List<DfProductInfo> list = dfProductInfoService.list(queryWrapper);
         List<DfOrder> dfOrders = dfOrderService.list();

bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java

@@ -76,8 +76,8 @@ public class DfProductMomentController extends BaseController {
         condition(queryWrapper,dfProductMoment);
         boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
         if (!admin) {
+            if (!sysUser.getDeptId().equals(-1L)) {
                 if ("-99".equals(dfProductMoment.getStatus())) {
-
                 } else {
                     SysUser byId = userService.getById(SecurityUtils.getUserId());
                     if ("jj".equals(byId.getUserType()) || "kh".equals(byId.getUserType())) {
@@ -85,6 +85,7 @@ public class DfProductMomentController extends BaseController {
                     }
                 }
             }
+        }
         List<DfProductMoment> list = dfProductMomentService.list(queryWrapper);
         List<CmAttach> attachVo = cmAttachService.list();
         Map<String, List<CmAttach>> attachMap = attachVo.stream()

bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java

@@ -85,8 +85,8 @@ public class DfProductPosterController extends BaseController {
             queryWrapper.last("ORDER BY CASE WHEN t.serial_number IS NULL THEN 1 ELSE 0 END, t.serial_number ASC");
         }
         if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+            if (!sysUser.getDeptId().equals(-1L)) {
                 if ("-99".equals(dfProductPoster.getStatus())) {
-
                 } else {
                     List<Long> productIdsByBrokerId = dfBrokerService.getProductIdsByBrokerId();
                     List<DfProductPoster> list = dfProductPosterService.list(new LambdaQueryWrapper<DfProductPoster>()
@@ -107,6 +107,7 @@ public class DfProductPosterController extends BaseController {
                     }
                 }
             }
+        }
         conditionByMPJ(queryWrapper,dfProductPoster);
         startPage();
         List<DfProductPoster> list = dfProductPosterService.list(queryWrapper);