页面修改

Mall.Module.User/EmployeeModule.cs

@@ -198,7 +198,13 @@ namespace Mall.Module.User
         /// <returns></returns>
         public RB_Emp_Config_Extend GetEmpConfigListModule(RB_Emp_Config_Extend query)
         {
-            return emp_ConfigRepository.GetEmpConfigListRepository(query)?.FirstOrDefault();
+            RB_Emp_Config_Extend extModel = new RB_Emp_Config_Extend();
+            var list = emp_ConfigRepository.GetEmpConfigListRepository(query);
+            if (list != null)
+            {
+                extModel = list.FirstOrDefault();
+            }
+            return extModel;
         }
 
         /// <summary>
@@ -209,6 +215,11 @@ namespace Mall.Module.User
         public bool SetEmpConfigModule(RB_Emp_Config_Extend extModel)
         {
             bool flag = false;
+            var defaultModel = GetEmpConfigListModule(new RB_Emp_Config_Extend() { MallBaseId = extModel.MallBaseId, TenantId = extModel.TenantId });
+            if (defaultModel != null && defaultModel.ConfigId>0)
+            {
+                extModel.ConfigId = defaultModel.ConfigId;
+            }
             if (extModel.ConfigId > 0)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()

Mall.Repository/User/RB_Emp_ConfigRepository.cs

@@ -20,7 +20,7 @@ namespace Mall.Repository.User
         public List<RB_Emp_Config_Extend> GetEmpConfigListRepository(RB_Emp_Config_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@" SELECT * FROM RB_Emp_Config WHERE 1=1 AND Status=0 ");
+            builder.AppendFormat(@" SELECT * FROM RB_Emp_Config WHERE 1=1  ");
             if (query.TenantId > 0)
             {
                 builder.AppendFormat(" AND {0}={1} ", nameof(RB_Emp_Config_Extend.TenantId), query.TenantId);