|
|
@@ -24,7 +24,15 @@ namespace CallCenterApi.Interface.Controllers.callout
|
|
24
|
24
|
public ActionResult GetList(FilterExcelTmp filter)
|
|
25
|
25
|
{
|
|
26
|
26
|
string sql = " and F_DBTableName='T_Call_PageField' ";
|
|
27
|
|
- sql += " and F_AttributeId not in (SELECT [F_FeildId] FROM [T_Call_PageField] where [F_TaskId]=" + filter.TaskId + ") ";
|
|
|
27
|
+ if (filter.TempId > 0)
|
|
|
28
|
+ {
|
|
|
29
|
+ sql += " and F_AttributeId not in (SELECT [F_FeildId] FROM [T_Call_PageField] where [F_TempId]=" + filter.TempId + ") ";
|
|
|
30
|
+ }
|
|
|
31
|
+ else
|
|
|
32
|
+ {
|
|
|
33
|
+ sql += " and F_AttributeId not in (SELECT [F_FeildId] FROM [T_Call_PageField] where [F_TaskId]=" + filter.TaskId + ") ";
|
|
|
34
|
+ }
|
|
|
35
|
+
|
|
28
|
36
|
if (filter.Type > 0)
|
|
29
|
37
|
{
|
|
30
|
38
|
sql += " and F_DBTypeName='" + filter.Type + "' ";
|
|
|
@@ -141,9 +149,9 @@ namespace CallCenterApi.Interface.Controllers.callout
|
|
141
|
149
|
public ActionResult GetSelectedList(FilterExcelTmp filter)
|
|
142
|
150
|
{
|
|
143
|
151
|
var sql = "";
|
|
144
|
|
- if (filter.TaskId > 0)
|
|
|
152
|
+ if (filter.TempId > 0)
|
|
145
|
153
|
{
|
|
146
|
|
- sql += " [F_TaskId]=" + filter.TaskId + " ";
|
|
|
154
|
+ sql += " [F_TempId]=" + filter.TempId + " ";
|
|
147
|
155
|
}
|
|
148
|
156
|
else
|
|
149
|
157
|
{
|