Parcourir la Source

坐席授权bug

lihai il y a 8 ans
Parent
commit
4091b12470

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SysConfigController.cs

@@ -250,7 +250,7 @@ namespace CallCenterApi.Interface.Controllers
250 250
             string saltValue = model.F_SaltValue;
251 251
             string passHashNew = SaltAndHashHelper.GetHashSha256(maxSeat + securityKey, saltValue); //将用户数据的密码采用已知的盐值进行加密
252 252
             //校验密码hash值是否一致
253
-            if (maxSeat >= currentSeat)
253
+            if (maxSeat > currentSeat)
254 254
             {
255 255
                 return passHashNew.Equals(passHash);
256 256
             }

+ 47 - 20
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -231,19 +231,28 @@ namespace CallCenterApi.Interface.Controllers
231 231
                     }
232 232
                 }
233 233
 
234
-                SysConfigController sys = new SysConfigController();
235
-                //话务人员限制权限判断
236
-                if (sys.IsValidSeatPermission())
234
+                if (input.IsSeat)
237 235
                 {
236
+                    SysConfigController sys = new SysConfigController();
237
+                    //话务人员限制权限判断
238
+                    if (sys.IsValidSeatPermission())
239
+                    {
240
+                        if (sysUserAccountBll.Add(userAccountModel) > 0)
241
+                            res = Success("新增成功!");
242
+                        else
243
+                            res = Error("新增失败!");
244
+                    }
245
+                    else
246
+                    {
247
+                        res = Error("话务人员数量已超!");
248
+                    }
249
+                }
250
+                else {
238 251
                     if (sysUserAccountBll.Add(userAccountModel) > 0)
239 252
                         res = Success("新增成功!");
240 253
                     else
241 254
                         res = Error("新增失败!");
242 255
                 }
243
-                else
244
-                {
245
-                    res = Error("话务人员数量已超!");
246
-                }
247 256
             }
248 257
             return res;
249 258
         }
@@ -306,19 +315,28 @@ namespace CallCenterApi.Interface.Controllers
306 315
                 userAccountModel.F_DeleteFlag = 0;
307 316
                 if (input.HjType != null)
308 317
                     userAccountModel.F_HJType = input.HjType;
309
-                SysConfigController sys = new SysConfigController();
310
-                //话务人员限制权限判断
311
-                if (sys.IsValidSeatPermission())
318
+                if (input.IsSeat)
312 319
                 {
320
+                    SysConfigController sys = new SysConfigController();
321
+                    //话务人员限制权限判断
322
+                    if (sys.IsValidSeatPermission())
323
+                    {
324
+                        if (sysUserAccountBll.Update(userAccountModel))
325
+                            res = Success("编辑成功!");
326
+                        else
327
+                            res = Error("编辑失败!");
328
+                    }
329
+                    else
330
+                    {
331
+                        res = Error("话务人员数量已超!");
332
+                    }
333
+                }
334
+                else {
313 335
                     if (sysUserAccountBll.Update(userAccountModel))
314 336
                         res = Success("编辑成功!");
315 337
                     else
316 338
                         res = Error("编辑失败!");
317 339
                 }
318
-                else
319
-                {
320
-                    res = Error("话务人员数量已超!");
321
-                }
322 340
             }
323 341
             return res;
324 342
         }
@@ -335,18 +353,27 @@ namespace CallCenterApi.Interface.Controllers
335 353
                 if (string.IsNullOrEmpty(idStr))
336 354
                     return Error("请选择用户");
337 355
                 SysConfigController sys = new SysConfigController();
338
-                //话务人员限制权限判断
339
-                if (sys.IsValidSeatPermission())
356
+                if (state == 0)
340 357
                 {
358
+                    //话务人员限制权限判断
359
+                    if (sys.IsValidSeatPermission())
360
+                    {
361
+                        if (sysUserAccountBll.DeleteList(idStr, state))
362
+                            res = Success("设置成功");
363
+                        else
364
+                            res = Error("设置失败");
365
+                    }
366
+                    else
367
+                    {
368
+                        res = Error("话务人员数量已超!");
369
+                    }
370
+                }
371
+                else {
341 372
                     if (sysUserAccountBll.DeleteList(idStr, state))
342 373
                         res = Success("设置成功");
343 374
                     else
344 375
                         res = Error("设置失败");
345 376
                 }
346
-                else
347
-                {
348
-                    res = Error("话务人员数量已超!");
349
-                }
350 377
             }
351 378
             return res;
352 379
         }