Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs

@@ -1303,7 +1303,14 @@ namespace APT.BS.WebApi.Controllers.Api
                     //if (!string.IsNullOrEmpty(strRole))
                     //{
                     //    listStrRole = strRole.Split(charSplit, StringSplitOptions.RemoveEmptyEntries).ToList();
+                    try
+                    {
                         listRoleItem = listRole.FindAll(e => listStrRole.Contains(e.NAME)).ToList();
+                    }
+                    catch
+                    {
+                        listRoleItem = null;
+                    }
                     //}
                     //else
                     //{