diff --git a/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs b/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs
index 6c958f1..c7972c7 100644
--- a/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs
+++ b/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs
@@ -89,12 +89,13 @@ namespace OpenAuth.App.ServiceApp.FireManagement
         /// </summary>
         /// <param name="username"></param>
         /// <returns></returns>
-        public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username)
+        public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username, string unitname)
         {
             using (var db = base.UnitWork.CreateContext())
             {
                 var users = await db.User.AsQueryable()
-                    .WhereIF(string.IsNullOrEmpty(username), r => r.Name.Contains(username))
+                    .WhereIF(!string.IsNullOrEmpty(username), r => r.Name.Contains(username))
+                    .WhereIF(!string.IsNullOrEmpty(unitname), r => r.UnitName.Contains(username))
                     .Where(r => r.Status == 0)
                     .Select(r => new SysUserResp
                     {
diff --git a/OpenAuth.Repository/Domain/SysUser.cs b/OpenAuth.Repository/Domain/SysUser.cs
index 8966926..79b9630 100644
--- a/OpenAuth.Repository/Domain/SysUser.cs
+++ b/OpenAuth.Repository/Domain/SysUser.cs
@@ -57,5 +57,9 @@ namespace OpenAuth.Repository.Domain
         public long CreateId { get; set; }
         [Description("加密密钥")]
         public string Secretkey { get; set; }
+        /// <summary>
+        /// 单位名称
+        /// </summary>
+        public string UnitName { get; set; }
     }
 }
\ No newline at end of file
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs
index aa311a8..fe5c2d8 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs
@@ -48,12 +48,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         /// <param name="username"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username)
+        public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username, string unitname)
         {
             Response<List<SysUserResp>> response = new Response<List<SysUserResp>>();
             try
             {
-                return await _app.LoadFireClueUser(username);
+                return await _app.LoadFireClueUser(username, unitname);
             }
             catch (Exception ex)
             {
@@ -87,7 +87,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         /// 查询人员单位信息
         /// </summary>
         /// <returns></returns>
-        [HttpGet] 
+        [HttpGet]
         public async Task<Response<List<FmUserUnit>>> GetUserUnit()
         {
             Response<List<FmUserUnit>> response = new Response<List<FmUserUnit>>();