|
@@ -1006,7 +1006,7 @@ func (this *OilSupplierController) GetDictList() {
|
|
|
userSvc.GetEntityById(this.User.Id, &userEntity)
|
|
userSvc.GetEntityById(this.User.Id, &userEntity)
|
|
|
dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
|
|
dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
|
|
|
dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
|
|
dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
|
|
|
- // dictList["CountryList"] = areaJsonSvc.GetCountryList()
|
|
|
|
|
|
|
+ dictList["CountryList"] = areaJsonSvc.GetCountryList()
|
|
|
//获取我创建的所有公司
|
|
//获取我创建的所有公司
|
|
|
var list []supplier.OilSupplier
|
|
var list []supplier.OilSupplier
|
|
|
if this.User.IsCompanyUser == 1 {
|
|
if this.User.IsCompanyUser == 1 {
|
|
@@ -1059,7 +1059,7 @@ func (this *OilSupplierController) GetDictListByStatus() {
|
|
|
userSvc.GetEntityById(this.User.Id, &userEntity)
|
|
userSvc.GetEntityById(this.User.Id, &userEntity)
|
|
|
dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
|
|
dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
|
|
|
dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
|
|
dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
|
|
|
- // dictList["CountryList"] = areaJsonSvc.GetCountryList()
|
|
|
|
|
|
|
+ dictList["CountryList"] = areaJsonSvc.GetCountryList()
|
|
|
//获取我创建的所有公司
|
|
//获取我创建的所有公司
|
|
|
var list []supplier.OilSupplier
|
|
var list []supplier.OilSupplier
|
|
|
if this.User.IsCompanyUser == 1 {
|
|
if this.User.IsCompanyUser == 1 {
|
ljm