Browse Source

销售下拉框去除层级关系

yangzian 4 years ago
parent
commit
c317b0360f

+ 18 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementController.java

@@ -102,7 +102,7 @@ public class SettlementController {
         Set<String> ids = new HashSet<String>(){{
         Set<String> ids = new HashSet<String>(){{
             add(userId);
             add(userId);
         }};
         }};
-        if ("admin".equals(roleCode)){
+        /*if ("admin".equals(roleCode)){
             //查询所有销售 && 媒介
             //查询所有销售 && 媒介
             List allSaleList = cwjsPolicyInfoService.getAllSaleAndMeidaManager();
             List allSaleList = cwjsPolicyInfoService.getAllSaleAndMeidaManager();
             return Result.successMsg("查询所有销售和媒介用户",allSaleList);
             return Result.successMsg("查询所有销售和媒介用户",allSaleList);
@@ -123,7 +123,24 @@ public class SettlementController {
                 ids.addAll(new HashSet<>(saleIds));
                 ids.addAll(new HashSet<>(saleIds));
             }
             }
 
 
+        }*/
+        if ("admin".equals(roleCode)){
+            //查询所有销售 && 媒介
+            List allSaleList = cwjsPolicyInfoService.getAllSaleAndMeidaManager();
+            return Result.successMsg("查询所有销售和媒介用户",allSaleList);
+
+        }else {
+            //查询所有包含自己的下级
+            // ids = materialReportOverViewService.recursiveQuerySubordinate(userId);
+            //查询 销售及助理 关联对应的人员
+            List<String> saleIds = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(userId);
+            if (!Check.isNull(saleIds)){
+                ids.addAll(new HashSet<>(saleIds));
+            }
+
         }
         }
+
+
         List<Map<String,Object>> list = settlementInfoService.getUserByIds(ids);
         List<Map<String,Object>> list = settlementInfoService.getUserByIds(ids);
         return Result.successMsg("查询用户",list);
         return Result.successMsg("查询用户",list);
     }
     }