|
@@ -1629,6 +1629,11 @@ namespace Util
|
|
|
{
|
|
|
checkObj = GetQueryTableData(condiDic, returnFieldId);
|
|
|
checkTitle = GetQueryTableTitle(condiDic, returnFieldId);
|
|
|
+ if(checkObj == returnFieldId)
|
|
|
+ {
|
|
|
+ checkObj = getRequestParams(projectId, content, returnFieldId);
|
|
|
+ checkTitle = checkObj;
|
|
|
+ }
|
|
|
}
|
|
|
// if(!sub.recursionFlag)
|
|
|
// {
|
|
@@ -1975,6 +1980,7 @@ namespace Util
|
|
|
foreach(string subField in list)
|
|
|
{
|
|
|
string val = GetQueryTableData(condiDic, subField);
|
|
|
+ if(subField == val) val = getRequestParams(projectId, content, subField);
|
|
|
if(subField == val) val = GetStartData(startData, subField);
|
|
|
prizeSourceData += val + ",";
|
|
|
}
|
|
@@ -1982,7 +1988,14 @@ namespace Util
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- prizeSourceData = GetQueryTableData(condiDic, prizeSourceField);
|
|
|
+ if(sub.prizeSourceFieldType == "request_param")
|
|
|
+ {
|
|
|
+ prizeSourceData = getRequestParams(projectId, content, prizeSourceField);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ prizeSourceData = GetQueryTableData(condiDic, prizeSourceField);
|
|
|
+ }
|
|
|
}
|
|
|
if(string.IsNullOrEmpty(prizeSourceData)) prizeSourceData = "0";
|
|
|
if(prizeSourceField.Contains("/") && number > 0)
|