diff --git a/Mini.Crm.sln b/Mini.Crm.sln index 959cb2f..8745215 100644 --- a/Mini.Crm.sln +++ b/Mini.Crm.sln @@ -11,12 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mini.Services", "Mini.Servi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mini.Common", "Mini.Common\Mini.Common.csproj", "{34C1F847-C0C2-452E-BC08-01AC9DF814F8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test1", "Test1\Test1.csproj", "{2179F183-C2E6-45EB-BDEE-9535FA91494A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsApp1", "WindowsFormsApp1\WindowsFormsApp1.csproj", "{FFB66D6A-27D7-4B65-B3EB-BF059FC8B5FC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Winform2", "Winform2\Winform2.csproj", "{3CD263D6-D43C-41CA-9CF1-DBD7E65924B1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,18 +33,6 @@ Global {34C1F847-C0C2-452E-BC08-01AC9DF814F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {34C1F847-C0C2-452E-BC08-01AC9DF814F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {34C1F847-C0C2-452E-BC08-01AC9DF814F8}.Release|Any CPU.Build.0 = Release|Any CPU - {2179F183-C2E6-45EB-BDEE-9535FA91494A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2179F183-C2E6-45EB-BDEE-9535FA91494A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2179F183-C2E6-45EB-BDEE-9535FA91494A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2179F183-C2E6-45EB-BDEE-9535FA91494A}.Release|Any CPU.Build.0 = Release|Any CPU - {FFB66D6A-27D7-4B65-B3EB-BF059FC8B5FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFB66D6A-27D7-4B65-B3EB-BF059FC8B5FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFB66D6A-27D7-4B65-B3EB-BF059FC8B5FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFB66D6A-27D7-4B65-B3EB-BF059FC8B5FC}.Release|Any CPU.Build.0 = Release|Any CPU - {3CD263D6-D43C-41CA-9CF1-DBD7E65924B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CD263D6-D43C-41CA-9CF1-DBD7E65924B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CD263D6-D43C-41CA-9CF1-DBD7E65924B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CD263D6-D43C-41CA-9CF1-DBD7E65924B1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Mini.Services/ww/ww_hhuser_Service.cs b/Mini.Services/ww/ww_hhuser_Service.cs index eb7849d..3ba5c7c 100644 --- a/Mini.Services/ww/ww_hhuser_Service.cs +++ b/Mini.Services/ww/ww_hhuser_Service.cs @@ -1257,7 +1257,7 @@ FROM if (entry != null) { GroupUser guser = new GroupUser() { userid = entry.userid, roomid = room.roomid, corpid = corp, name = entry.uname, avatar = "" }; - if (entry.exinfo != null && entry.exinfo != "-") + if (entry.exinfo != null && entry.exinfo != "-" && !string.IsNullOrEmpty(entry.exinfo)) { HHuserInfo info = JsonHelper.JsonDivertToObj(entry.exinfo); if (string.IsNullOrEmpty(info.thumb_avatar)) diff --git a/Mini.Web/Mini.Web.csproj b/Mini.Web/Mini.Web.csproj index 94b7945..0cb8ea6 100644 --- a/Mini.Web/Mini.Web.csproj +++ b/Mini.Web/Mini.Web.csproj @@ -42,7 +42,6 @@ -