添加单位编码和律师事务所（department）名称筛选

24Hour/Controllers/system/SystemControllerController.cs

@@ -150,6 +150,8 @@ namespace _24Hour.Controllers.system
                 .WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone))
                 .WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties))
                 .WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId))
+                .WhereIF(!UserModel.unitCode.IsNull(), q => q.unitCode == UserModel.unitCode)
+                .WhereIF(!UserModel.department.IsNull(), q => q.departmentName.Contains(UserModel.department))
                 .WhereIF(UserModel.audit != null, q => q.audit == UserModel.audit)
                 .WhereIF(UserModel.isdeactivate >= 0, q => q.isdeactivate == UserModel.isdeactivate)
                 .Where(q => q.IsDeleted == 0 && q.usertype == 1)
@@ -1214,7 +1216,7 @@ namespace _24Hour.Controllers.system
             {
                 //判断单位编码是否已存在
                 var data = await _db.Queryable<App_Sys_UnitModel>().Where(q => q.unitCode == Unitdata.unitCode).FirstAsync();
-                if (data != null)
+                if (data != null && data.Id != Unitdata.Id)
                 {
 
                     result.IsSucceed = false;