|
@@ -5339,7 +5339,7 @@ FROM
|
|
/// </summary>
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpGet]
|
|
[HttpGet]
|
|
- public IActionResult SharedFileInit(int userid ,int portType)
|
|
|
|
|
|
+ public async Task<IActionResult> SharedFileInit(int userid ,int portType)
|
|
{
|
|
{
|
|
|
|
|
|
var marketingDepartmentIds = new List<int> { 6, 26 , 27 , 28 };
|
|
var marketingDepartmentIds = new List<int> { 6, 26 , 27 , 28 };
|
|
@@ -5365,6 +5365,8 @@ FROM
|
|
|
|
|
|
if (portType == 1)
|
|
if (portType == 1)
|
|
{
|
|
{
|
|
|
|
+ var provCityDatas = await _groupRepository.ProvinceCityBasicSource();
|
|
|
|
+
|
|
var dropDownGroupList = _sqlSugar.Queryable<Grp_DelegationInfo>()
|
|
var dropDownGroupList = _sqlSugar.Queryable<Grp_DelegationInfo>()
|
|
.Where(x => x.IsDel == 0)
|
|
.Where(x => x.IsDel == 0)
|
|
.OrderByDescending(x=> x.VisitDate )
|
|
.OrderByDescending(x=> x.VisitDate )
|
|
@@ -5372,7 +5374,36 @@ FROM
|
|
{
|
|
{
|
|
x.TeamName,
|
|
x.TeamName,
|
|
x.Id,
|
|
x.Id,
|
|
- }).ToList();
|
|
|
|
|
|
+ x.CityId,
|
|
|
|
+ })
|
|
|
|
+ .ToList()
|
|
|
|
+ .Select(x=>
|
|
|
|
+ {
|
|
|
|
+ var provinceId = x.CityId;
|
|
|
|
+ var isDefualtVal = true;
|
|
|
|
+ if (provinceId > 0)
|
|
|
|
+ {
|
|
|
|
+ var parentId = _groupRepository.FindParentIdByChildId(provCityDatas, provinceId);
|
|
|
|
+ if (parentId != null)
|
|
|
|
+ {
|
|
|
|
+ isDefualtVal = false;
|
|
|
|
+ provinceId = (int)parentId;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (isDefualtVal)
|
|
|
|
+ {
|
|
|
|
+ provinceId = 122; //默认四川
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return new
|
|
|
|
+ {
|
|
|
|
+ x.TeamName,
|
|
|
|
+ x.Id,
|
|
|
|
+ provinceId,
|
|
|
|
+ };
|
|
|
|
+ })
|
|
|
|
+ .ToList();
|
|
|
|
|
|
return Ok(JsonView(true, "SUCCESS!", new
|
|
return Ok(JsonView(true, "SUCCESS!", new
|
|
{
|
|
{
|