合并冲突解决

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -3016,7 +3016,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
     @Override
     public List<FsStoreOrderCountsVO> selectFsStoreOrderCountsByDept(Map<String, Object> map, Long deptId) {
-        List<FsStoreOrderCountsVO> vos = fsStoreOrderMapper.selectFsStoreOrderCountsByDept(map);
+        List<FsStoreOrderCountsVO> vos = fsStoreOrderMapper.selectFsStoreOrderGroupByCompanyUserId(map);
         if (!vos.isEmpty()) {
             List<FsStoreOrderCountsVO> totalVos = new ArrayList<>();
             //查询组名
@@ -3778,4 +3778,19 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         map.put("DBL", "德邦");
         return map;
     }
+
+    @Override
+    public List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByCompanyId(Map<String,Object> map) {
+        return fsStoreOrderMapper.selectFsStoreOrderGroupByCompanyId(map);
+    }
+
+    @Override
+    public List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByDeptId(Map<String, Object> map) {
+        return fsStoreOrderMapper.selectFsStoreOrderGroupByDeptId(map);
+    }
+
+    @Override
+    public List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByUserId(Map<String, Object> map) {
+        return fsStoreOrderMapper.selectFsStoreOrderGroupByUserId(map);
+    }
 }