|
|
@@ -414,7 +414,7 @@ func CheckActivitySpecialUpdatePower(adminId int, activityInfo *cygx.ActivitySpe
|
|
|
}
|
|
|
|
|
|
// GetChartPermissionSpecialSurplusByCompany 获取公司专项调研次数-分品种
|
|
|
-func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap map[int]int, err error) {
|
|
|
+func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, chartNumMap map[int]int,mapChartName map[string]int, err error) {
|
|
|
companyDetail, e := cygx.GetCompanyDetailByIdGroup(companyId)
|
|
|
if e != nil {
|
|
|
err = errors.New("GetCompanyDetailByIdGroup, Err: " + e.Error())
|
|
|
@@ -432,7 +432,8 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap map[
|
|
|
//chartMap := map[int]string{utils.YI_YAO_ID:utils.YI_YAO_NAME, utils.XIAO_FEI_ID:utils.XIAO_FEI_NAME, utils.KE_JI_ID:utils.KE_JI_NAME, utils.ZHI_ZAO_ID:utils.ZHI_ZAO_NAME}
|
|
|
chartNumMap = map[int]int{utils.YI_YAO_ID:0, utils.XIAO_FEI_ID:0, utils.KE_JI_ID:0, utils.ZHI_ZAO_ID:0}
|
|
|
if companyDetail.Status == "正式" {
|
|
|
- userType, packageType, _, _, _ := GetUserType(companyId)
|
|
|
+ var packageType int
|
|
|
+ userType, packageType, _, _, _ = GetUserType(companyId)
|
|
|
if userType == 2 {
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
@@ -500,7 +501,7 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap map[
|
|
|
return
|
|
|
}
|
|
|
var chartPermissionIdSlice []string
|
|
|
- mapChartName := make(map[string]int)
|
|
|
+ mapChartName = make(map[string]int)
|
|
|
mapPermissionNameTrip := make(map[string]int)
|
|
|
//mapPermissionName := make(map[int]string)
|
|
|
for _, v := range list {
|
ziwen