..

SubProject/FCOMMON/DataBaseManager.cs

@@ -393,7 +393,7 @@ namespace FCOMMON
         public static Dictionary<string, string> getUserList(int baseLevel = 1)
         {
             string where = "isnull(level,0) >= " + baseLevel.ToString();
-            return getTwoColumnList("Users", "id", "name", where, "name");
+            return getTwoColumnList("vGroupUser", "id", "name", where, "name");
 
         }
         public static System.Data.DataTable getUserTable(int baseLevel = 1)
@@ -697,9 +697,9 @@ namespace FCOMMON
             cn.Open();
             var sql = "select idx,isnull(name,''),pdate  from Projects" +
                 " where gcode='{0}'" +
-                " and  isnull(userManager,'') like '%{1}%'" +
+                " and  (isnull(userManager,'') like '%{1}%'" +
                 " or  isnull(userMain,'') like '%{1}%'" +
-                " or  isnull(usersub,'') like '%{1}%'" +
+                " or  isnull(usersub,'') like '%{1}%')" +
                 " order by pdate desc,name";
             sql = string.Format(sql, FCOMMON.info.Login.gcode, userName);
             var cmd = new SqlCommand(sql, cn);

SubProject/FCOMMON/FCOMMON.csproj

@@ -120,6 +120,7 @@
     <Compile Include="keyValuedataTable.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Info.cs" />
+    <Compile Include="Setting.cs" />
     <Compile Include="Util_Form.cs" />
     <Compile Include="Util.cs" />
     <Compile Include="Util_Farpoint.cs" />

SubProject/FCOMMON/Setting.cs

@@ -0,0 +1,49 @@
+//190806    chi getWorkWeek 추가
+//190805    chi MakeCSVString 추가
+//180903    chi makefilepath/ ftppath 추가
+//180807    chi rad2deg, deg2rad 추가
+//180625    chi  ToCharHexString,ToStringFromHexString 추가
+//180624    chi isLocalApplication 추가
+//180618    chi GetCSVBuffer 추가
+//180614    chi map 명령어 추가
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Windows.Forms;
+
+namespace FCOMMON
+{
+    public static partial class Setting
+    {
+        private static SystemSetting _system = null;
+        public static SystemSetting system
+        {
+            get
+            {
+                if(_system== null)
+                {
+                    _system = new SystemSetting();
+                    _system.filename = AppDomain.CurrentDomain.BaseDirectory + "Commonsetting.xml";
+                    _system.Load();
+                }
+                return _system;
+            }
+        }
+    }
+    public class SystemSetting : arUtil.Setting
+    {
+        public Boolean fullScreen { get; set; }
+        public override void AfterLoad()
+        {
+            //throw new NotImplementedException();
+        }
+        public override void AfterSave()
+        {
+            //throw new NotImplementedException();
+        }
+    }
+}