|
@@ -7197,7 +7197,6 @@ namespace WingManagementModule.Service
|
|
|
resp.UserFeatureItems = GetUserFinalResourceItems(result.PageData, request.Language, resp.UserRoleFeatureCodes, request.IsResearchProjectUser);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
if (_isResearchEditionService)
|
|
|
{
|
|
|
//获取dongle信息
|
|
@@ -7246,9 +7245,16 @@ namespace WingManagementModule.Service
|
|
|
};
|
|
|
model.FatherCode = "";
|
|
|
model.UniqueCode = dongleItem;
|
|
|
- model.Disabled = true;
|
|
|
- resp.UserFeatureCodes.Add(dongleItem);
|
|
|
- resp.UserFeatureItems.Add(model);
|
|
|
+
|
|
|
+ if (newFeatureList.Contains(dongleItem))
|
|
|
+ {
|
|
|
+ resp.UserFeatureCodes.Add(dongleItem);
|
|
|
+ resp.UserFeatureItems.Add(model);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ resp.UserFeatureItems.Add(model);
|
|
|
+ }
|
|
|
}
|
|
|
resp.UserFeatureCodes = resp.UserFeatureCodes.Distinct().ToList();
|
|
|
}
|