|
@@ -91,7 +91,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
data.put("monthlyGoalValue", monthly);
|
|
|
result = Result.ok(data);
|
|
|
//分公司总经理
|
|
|
- } else if ("CompanyManager".equals(roleCode)) {
|
|
|
+ } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
//账户集合
|
|
|
List<Long> accountIds = baseMapper.getCompanyAccountIds(companyId, mediaId);
|
|
|
JSONObject data = getManagerData(accountIds, userId, mediaId, companyId);
|
|
@@ -163,7 +163,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
QueryWrapper<ManagerSaleValue> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("company_id", sale.getCompanyId());
|
|
|
queryWrapper.eq("media_id", sale.getMediaId());
|
|
|
- queryWrapper.eq("manage_id", sale.getUserId());
|
|
|
+ queryWrapper.eq("user_id", sale.getUserId());
|
|
|
ManagerSaleValue one = this.getOne(queryWrapper);
|
|
|
if (Check.isNull(one)) {
|
|
|
sale.setId(UUID.randomUUID().toString().replace("-", ""));
|
|
@@ -215,7 +215,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
|
|
|
}
|
|
|
//分公司总经理
|
|
|
- } else if ("CompanyManager".equals(roleCode)) {
|
|
|
+ } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
if (startTime.equals(endTime)) {
|
|
|
data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, companyId, startTime);
|
|
|
} else {
|
|
@@ -340,7 +340,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
return getProjectDailyCharges(projectIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
//分公司总经理
|
|
|
- } else if ("CompanyManager".equals(roleCode)) {
|
|
|
+ } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
List<Long> projectIds = baseMapper.querySalesDirectorProjectIds(companyId, mediaId, null);
|
|
|
if (startTime.equals(endTime)) {
|
|
|
return getProjectDailyCharges(projectIds, mediaId, startTime, null, pageNo, pageSize);
|