|
|
@@ -28,79 +28,80 @@ namespace CallCenterApi.Interface.Controllers
|
|
28
|
28
|
{
|
|
29
|
29
|
DataTable dt = new DataTable();
|
|
30
|
30
|
string sql = " ";
|
|
31
|
|
-
|
|
32
|
|
- if (filter.dptid > 0)
|
|
33
|
|
- {
|
|
|
31
|
+
|
|
|
32
|
+ if (filter.dptid > 0)
|
|
|
33
|
+ {
|
|
34
|
34
|
Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(filter.dptid);
|
|
35
|
|
- if (deptModel != null) {
|
|
36
|
|
- sql += " and F_DeptId in ( select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptModel.F_DeptCode + "%') ";
|
|
37
|
|
- }
|
|
38
|
|
- }
|
|
39
|
|
- if (!string.IsNullOrWhiteSpace(filter.Key))
|
|
|
35
|
+ if (deptModel != null)
|
|
40
|
36
|
{
|
|
41
|
|
- sql = "";
|
|
42
|
|
- string str = string.Format(" and (F_UserCode like '%{0}%' or F_UserName like '%{1}%')", filter.Key, filter.Key);
|
|
43
|
|
- sql += str;
|
|
|
37
|
+ sql += " and F_DeptId in ( select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptModel.F_DeptCode + "%') ";
|
|
44
|
38
|
}
|
|
45
|
|
- int recordCount = 0;
|
|
46
|
|
- dt = BLL.PagerBLL.GetListPager(
|
|
47
|
|
- "T_Sys_UserAccount",
|
|
48
|
|
- "F_UserId",
|
|
49
|
|
- "*",
|
|
50
|
|
- sql,
|
|
51
|
|
- "ORDER BY F_UserId desc",
|
|
52
|
|
- filter.PageSize,
|
|
53
|
|
- filter.PageIndex,
|
|
54
|
|
- true,
|
|
55
|
|
- out recordCount);
|
|
|
39
|
+ }
|
|
|
40
|
+ if (!string.IsNullOrWhiteSpace(filter.Key))
|
|
|
41
|
+ {
|
|
|
42
|
+ sql = "";
|
|
|
43
|
+ string str = string.Format(" and (F_UserCode like '%{0}%' or F_UserName like '%{1}%')", filter.Key, filter.Key);
|
|
|
44
|
+ sql += str;
|
|
|
45
|
+ }
|
|
|
46
|
+ int recordCount = 0;
|
|
|
47
|
+ dt = BLL.PagerBLL.GetListPager(
|
|
|
48
|
+ "T_Sys_UserAccount",
|
|
|
49
|
+ "F_UserId",
|
|
|
50
|
+ "*",
|
|
|
51
|
+ sql,
|
|
|
52
|
+ "ORDER BY F_UserId desc",
|
|
|
53
|
+ filter.PageSize,
|
|
|
54
|
+ filter.PageIndex,
|
|
|
55
|
+ true,
|
|
|
56
|
+ out recordCount);
|
|
56
|
57
|
|
|
57
|
|
- List<Model.UserAccount> modelList = new BLL.UserAccount().DataTableToList(dt);
|
|
58
|
|
- var obj = new
|
|
|
58
|
+ List<Model.UserAccount> modelList = new BLL.UserAccount().DataTableToList(dt);
|
|
|
59
|
+ var obj = new
|
|
|
60
|
+ {
|
|
|
61
|
+ rows = modelList.Select(x => new
|
|
59
|
62
|
{
|
|
60
|
|
- rows = modelList.Select(x => new
|
|
61
|
|
- {
|
|
62
|
|
- F_UserId = x.F_UserId,
|
|
63
|
|
- F_UserCode = x.F_UserCode,
|
|
64
|
|
- F_ExtensionNumber = x.F_ExtensionNumber,
|
|
65
|
|
- F_UserName = x.F_UserName,
|
|
66
|
|
- F_GroupName = x.F_GroupName,
|
|
67
|
|
- F_DeptId = x.F_DeptId,
|
|
68
|
|
- F_RoleId = x.F_RoleId,
|
|
69
|
|
- F_GroupId = x.F_GroupId,
|
|
70
|
|
- F_SeatFlag = x.F_SeatFlag,
|
|
71
|
|
- F_SeatRight = x.F_SeatRight,
|
|
72
|
|
- F_SeatLevel = x.F_SeatLevel,
|
|
73
|
|
- F_SexFlag = x.F_SexFlag,
|
|
74
|
|
- F_RemindFlag = x.F_RemindFlag,
|
|
75
|
|
- F_Remark = x.F_Remark,
|
|
76
|
|
- F_Telephone = x.F_Telephone,
|
|
77
|
|
- F_Mobile = x.F_Mobile,
|
|
78
|
|
- F_HomePhone = x.F_HomePhone,
|
|
79
|
|
- F_Birthday = x.F_Birthday,
|
|
80
|
|
- F_CreateOn = x.F_CreateOn,
|
|
81
|
|
- F_CancelOn = x.F_CancelOn,
|
|
82
|
|
- F_DeleteFlag = x.F_DeleteFlag,
|
|
83
|
|
- F_APPOnFlag = x.F_APPOnFlag,
|
|
84
|
|
- F_LastActiveTime = x.F_LastActiveTime,
|
|
85
|
|
- F_See = x.F_See,
|
|
86
|
|
- F_HJType = x.F_HJType,
|
|
87
|
|
- F_PId = x.F_PId,
|
|
88
|
|
- F_TmId = x.F_TmId,
|
|
89
|
|
- F_RoleName = x.F_RoleName,
|
|
90
|
|
- F_DeptName = x.F_DeptName,
|
|
91
|
|
- F_WorkNumber = x.F_WorkNumber,
|
|
92
|
|
- //F_WXNo=x.F_WXNo,
|
|
93
|
|
- F_SeatGroup = x.F_SeartGroup
|
|
94
|
|
- }),
|
|
95
|
|
- total = recordCount
|
|
96
|
|
- };
|
|
|
63
|
+ F_UserId = x.F_UserId,
|
|
|
64
|
+ F_UserCode = x.F_UserCode,
|
|
|
65
|
+ F_ExtensionNumber = x.F_ExtensionNumber,
|
|
|
66
|
+ F_UserName = x.F_UserName,
|
|
|
67
|
+ F_GroupName = x.F_GroupName,
|
|
|
68
|
+ F_DeptId = x.F_DeptId,
|
|
|
69
|
+ F_RoleId = x.F_RoleId,
|
|
|
70
|
+ F_GroupId = x.F_GroupId,
|
|
|
71
|
+ F_SeatFlag = x.F_SeatFlag,
|
|
|
72
|
+ F_SeatRight = x.F_SeatRight,
|
|
|
73
|
+ F_SeatLevel = x.F_SeatLevel,
|
|
|
74
|
+ F_SexFlag = x.F_SexFlag,
|
|
|
75
|
+ F_RemindFlag = x.F_RemindFlag,
|
|
|
76
|
+ F_Remark = x.F_Remark,
|
|
|
77
|
+ F_Telephone = x.F_Telephone,
|
|
|
78
|
+ F_Mobile = x.F_Mobile,
|
|
|
79
|
+ F_HomePhone = x.F_HomePhone,
|
|
|
80
|
+ F_Birthday = x.F_Birthday,
|
|
|
81
|
+ F_CreateOn = x.F_CreateOn,
|
|
|
82
|
+ F_CancelOn = x.F_CancelOn,
|
|
|
83
|
+ F_DeleteFlag = x.F_DeleteFlag,
|
|
|
84
|
+ F_APPOnFlag = x.F_APPOnFlag,
|
|
|
85
|
+ F_LastActiveTime = x.F_LastActiveTime,
|
|
|
86
|
+ F_See = x.F_See,
|
|
|
87
|
+ F_HJType = x.F_HJType,
|
|
|
88
|
+ F_PId = x.F_PId,
|
|
|
89
|
+ F_TmId = x.F_TmId,
|
|
|
90
|
+ F_RoleName = x.F_RoleName,
|
|
|
91
|
+ F_DeptName = x.F_DeptName,
|
|
|
92
|
+ F_WorkNumber = x.F_WorkNumber,
|
|
|
93
|
+ //F_WXNo=x.F_WXNo,
|
|
|
94
|
+ F_SeatGroup = x.F_SeartGroup
|
|
|
95
|
+ }),
|
|
|
96
|
+ total = recordCount
|
|
|
97
|
+ };
|
|
|
98
|
+
|
|
|
99
|
+ res = Content(obj.ToJson());
|
|
|
100
|
+
|
|
|
101
|
+
|
|
|
102
|
+ dt.Clear();
|
|
|
103
|
+ dt.Dispose();
|
|
97
|
104
|
|
|
98
|
|
- res = Content(obj.ToJson());
|
|
99
|
|
-
|
|
100
|
|
-
|
|
101
|
|
- dt.Clear();
|
|
102
|
|
- dt.Dispose();
|
|
103
|
|
-
|
|
104
|
105
|
}
|
|
105
|
106
|
return res;
|
|
106
|
107
|
}
|
|
|
@@ -145,7 +146,7 @@ namespace CallCenterApi.Interface.Controllers
|
|
145
|
146
|
F_Telephone = userModel.F_Telephone,
|
|
146
|
147
|
F_Mobile = userModel.F_Mobile,
|
|
147
|
148
|
F_HomePhone = userModel.F_HomePhone,
|
|
148
|
|
- F_Birthday = (userModel.F_Birthday!=null? userModel.F_Birthday.Value.ToString("yyyy-MM-dd"):""),
|
|
|
149
|
+ F_Birthday = (userModel.F_Birthday != null ? userModel.F_Birthday.Value.ToString("yyyy-MM-dd") : ""),
|
|
149
|
150
|
F_CreateOn = userModel.F_CreateOn,
|
|
150
|
151
|
F_CancelOn = userModel.F_CancelOn,
|
|
151
|
152
|
F_DeleteFlag = userModel.F_DeleteFlag,
|
|
|
@@ -157,7 +158,7 @@ namespace CallCenterApi.Interface.Controllers
|
|
157
|
158
|
F_TmId = userModel.F_TmId,
|
|
158
|
159
|
F_WorkNumber = userModel.F_WorkNumber,
|
|
159
|
160
|
//F_WXNo = userModel.F_WXNo,
|
|
160
|
|
- F_SeatGroup=userModel.F_SeartGroup,
|
|
|
161
|
+ F_SeatGroup = userModel.F_SeartGroup,
|
|
161
|
162
|
zxzname = zxzModel?.F_Name ?? "",
|
|
162
|
163
|
depname = depModel?.F_DeptName ?? ""
|
|
163
|
164
|
});
|
|
|
@@ -200,7 +201,7 @@ namespace CallCenterApi.Interface.Controllers
|
|
200
|
201
|
userAccountModel.F_RoleId = input.RoleId;
|
|
201
|
202
|
//if (input.GroupId != 0)
|
|
202
|
203
|
// userAccountModel.F_GroupId = input.GroupId;
|
|
203
|
|
-
|
|
|
204
|
+
|
|
204
|
205
|
userAccountModel.F_SeatFlag = input.IsSeat;
|
|
205
|
206
|
if (input.SearRight != null)
|
|
206
|
207
|
userAccountModel.F_SeatRight = input.SearRight;
|
|
|
@@ -251,7 +252,8 @@ namespace CallCenterApi.Interface.Controllers
|
|
251
|
252
|
res = Error("话务人员数量已超!");
|
|
252
|
253
|
}
|
|
253
|
254
|
}
|
|
254
|
|
- else {
|
|
|
255
|
+ else
|
|
|
256
|
+ {
|
|
255
|
257
|
if (sysUserAccountBll.Add(userAccountModel) > 0)
|
|
256
|
258
|
res = Success("新增成功!");
|
|
257
|
259
|
else
|
|
|
@@ -275,8 +277,8 @@ namespace CallCenterApi.Interface.Controllers
|
|
275
|
277
|
string ucode = input.Usercode.Trim();
|
|
276
|
278
|
if (!string.IsNullOrEmpty(ucode))
|
|
277
|
279
|
{
|
|
278
|
|
- Model.T_Sys_UserAccount uModel = new BLL.T_Sys_UserAccount().GetModel(ucode);
|
|
279
|
|
- if (uModel != null)
|
|
|
280
|
+ var uModels = new BLL.T_Sys_UserAccount().GetModelList(" F_UserCode='" + ucode + "'");
|
|
|
281
|
+ if (uModels.Count() > 1)
|
|
280
|
282
|
{
|
|
281
|
283
|
return Error("不能重复添加工号");
|
|
282
|
284
|
}
|
|
|
@@ -288,7 +290,7 @@ namespace CallCenterApi.Interface.Controllers
|
|
288
|
290
|
}
|
|
289
|
291
|
if (input.Username != null)
|
|
290
|
292
|
userAccountModel.F_UserName = input.Username.Trim();
|
|
291
|
|
- if(input.Password!=null)
|
|
|
293
|
+ if (input.Password != null)
|
|
292
|
294
|
userAccountModel.F_Password = input.Password.Trim();
|
|
293
|
295
|
if (input.Extno != null)
|
|
294
|
296
|
userAccountModel.F_ExtensionNumber = input.Extno.Trim();
|
|
|
@@ -328,7 +330,7 @@ namespace CallCenterApi.Interface.Controllers
|
|
328
|
330
|
|
|
329
|
331
|
userAccountModel.F_DeleteFlag = 0;
|
|
330
|
332
|
if (input.HjType != null)
|
|
331
|
|
- userAccountModel.F_HJType = input.HjType;
|
|
|
333
|
+ userAccountModel.F_HJType = input.HjType;
|
|
332
|
334
|
|
|
333
|
335
|
if (input.IsSeat)
|
|
334
|
336
|
{
|