修改待遇属性

GDZZ.Application/Entity/MiniBanner.cs

@@ -0,0 +1,23 @@
+using System;
+using SqlSugar;
+using System.ComponentModel;
+using GDZZ.Core.Entity;
+namespace GDZZ.Application.Entity
+{
+      /// <summary>
+      /// 活动广告列表
+      /// </summary>
+      [SugarTable("mini_banner")]
+      [Description("活动广告列表")]
+      public class MiniBanner  : DEntityBase
+      {
+                     /// <summary>
+                     /// 广告图片
+                     /// </summary>
+                     public string Url { get; set; }
+                     /// <summary>
+                     /// 跳转链接
+                     /// </summary>
+                     public string Skip { get; set; }
+      }	
+}

GDZZ.Application/Entity/MiniResume.cs

@@ -20,10 +20,6 @@ namespace GDZZ.Application.Entity
                      /// </summary>
                      public string Sak { get; set; }
                      /// <summary>
-                     /// 待遇
-                     /// </summary>
-                     public int Salary { get; set; }
-                     /// <summary>
                      /// 详情
                      /// </summary>
                      public string Info { get; set; }
@@ -47,5 +43,13 @@ namespace GDZZ.Application.Entity
                      /// 学历
                      /// </summary>
                      public string Record { get; set; }
+                     /// <summary>
+                     /// 公司名称
+                     /// </summary>
+                     public string CompanyName { get; set; }
+                     /// <summary>
+                     /// 待遇
+                     /// </summary>
+                     public string Salary { get; set; }
       }	
 }

GDZZ.Application/Enum/SalaryEnum.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GDZZ.Application.Enum
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public enum SalaryEnum
+    {
+
+    }
+}

GDZZ.Application/GDZZ.Application.xml

@@ -194,6 +194,21 @@
             好友ID
             </summary>
         </member>
+        <member name="T:GDZZ.Application.Entity.MiniBanner">
+            <summary>
+            活动广告列表
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.Entity.MiniBanner.Url">
+            <summary>
+            广告图片
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.Entity.MiniBanner.Skip">
+            <summary>
+            跳转链接
+            </summary>
+        </member>
         <member name="T:GDZZ.Application.Entity.MiniResume">
             <summary>
             小程序招聘列表
@@ -209,11 +224,6 @@
             要求
             </summary>
         </member>
-        <member name="P:GDZZ.Application.Entity.MiniResume.Salary">
-            <summary>
-            待遇
-            </summary>
-        </member>
         <member name="P:GDZZ.Application.Entity.MiniResume.Info">
             <summary>
             详情
@@ -244,6 +254,16 @@
             学历
             </summary>
         </member>
+        <member name="P:GDZZ.Application.Entity.MiniResume.CompanyName">
+            <summary>
+            公司名称
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.Entity.MiniResume.Salary">
+            <summary>
+            待遇
+            </summary>
+        </member>
         <member name="T:GDZZ.Application.Entity.SeIF">
             <summary>
             职业表
@@ -289,6 +309,11 @@
             地区级别 1-省、自治区、直辖市 2-地级市、地区、自治州、盟 3-市辖区、县级市、县
             </summary>
         </member>
+        <member name="T:GDZZ.Application.Enum.SalaryEnum">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:GDZZ.Application.Enum.SystemConst">
             <summary>
             redis枚举配置
@@ -471,6 +496,11 @@
             基础用户服务
             </summary>
         </member>
+        <member name="F:GDZZ.Application.BaseUserService._oauthConfig">
+            <summary>
+            获取配置文件
+            </summary>
+        </member>
         <member name="M:GDZZ.Application.BaseUserService.Update(GDZZ.Application.UpdateBaseUserInput)">
             <summary>
             更新基础用户
@@ -1237,6 +1267,123 @@
             <param name="pathType"></param>
             <returns></returns>
         </member>
+        <member name="T:GDZZ.Application.MiniBannerDto">
+            <summary>
+            活动广告列表输出参数
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.MiniBannerDto.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.MiniBannerDto.Url">
+            <summary>
+            广告图片
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.MiniBannerDto.Skip">
+            <summary>
+            跳转链接
+            </summary>
+        </member>
+        <member name="T:GDZZ.Application.MiniBannerInput">
+            <summary>
+            活动广告列表输入参数
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.MiniBannerInput.Url">
+            <summary>
+            广告图片
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.MiniBannerInput.Skip">
+            <summary>
+            跳转链接
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.AddMiniBannerInput.Url">
+            <summary>
+            广告图片
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.DeleteMiniBannerInput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.UpdateMiniBannerInput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="T:GDZZ.Application.MiniBannerOutput">
+            <summary>
+            活动广告列表输出参数
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.MiniBannerOutput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.MiniBannerOutput.Url">
+            <summary>
+            广告图片
+            </summary>
+        </member>
+        <member name="P:GDZZ.Application.MiniBannerOutput.Skip">
+            <summary>
+            跳转链接
+            </summary>
+        </member>
+        <member name="T:GDZZ.Application.MiniBannerService">
+            <summary>
+            活动广告列表服务
+            </summary>
+        </member>
+        <member name="M:GDZZ.Application.MiniBannerService.Page(GDZZ.Application.MiniBannerInput)">
+            <summary>
+            分页查询活动广告列表
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:GDZZ.Application.MiniBannerService.Add(GDZZ.Application.AddMiniBannerInput)">
+            <summary>
+            增加活动广告列表
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:GDZZ.Application.MiniBannerService.Delete(GDZZ.Application.DeleteMiniBannerInput)">
+            <summary>
+            删除活动广告列表
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:GDZZ.Application.MiniBannerService.Update(GDZZ.Application.UpdateMiniBannerInput)">
+            <summary>
+            更新活动广告列表
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:GDZZ.Application.MiniBannerService.Get(GDZZ.Application.QueryeMiniBannerInput)">
+            <summary>
+            获取活动广告详情
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:GDZZ.Application.MiniBannerService.List(GDZZ.Application.MiniBannerInput)">
+            <summary>
+            获取活动广告列表列表
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:GDZZ.Application.MiniResumeDto">
             <summary>
             小程序招聘列表输出参数
@@ -1342,6 +1489,11 @@
             地区
             </summary>
         </member>
+        <member name="P:GDZZ.Application.MiniResumeOutput.CompanyRegionName">
+            <summary>
+            公司地区
+            </summary>
+        </member>
         <member name="P:GDZZ.Application.MiniResumeOutput.Level">
             <summary>
             经验

GDZZ.Application/Service/BaseUser/BaseUserService.cs

@@ -7,6 +7,11 @@ using SqlSugar;
 using System.Linq;
 using System.Threading.Tasks;
 using GDZZ.Application.Entity;
+using Microsoft.Extensions.Options;
+using GDZZ.Core.Entity;
+using System.Threading;
+using Furion.FriendlyException;
+
 namespace GDZZ.Application
 {
     /// <summary>
@@ -16,10 +21,20 @@ namespace GDZZ.Application
     public class BaseUserService : IBaseUserService, IDynamicApiController, ITransient
     {
         private readonly SqlSugarRepository<BaseUser> _rep;
+        private readonly SqlSugarRepository<SysUser> _sysUserRep;  // 用户表仓储
+
+        /// <summary>
+        /// 获取配置文件
+        /// </summary>
+        private readonly ThirdParty _oauthConfig;
 
-        public BaseUserService(SqlSugarRepository<BaseUser> rep)
+       
+
+        public BaseUserService(SqlSugarRepository<BaseUser> rep, SqlSugarRepository<SysUser> _sysUserRep)
         {
             _rep = rep;
+            this._sysUserRep= _sysUserRep;
+
         }
 
 
@@ -31,15 +46,23 @@ namespace GDZZ.Application
         [HttpPost("/Mini/User/edit")]
         public async Task Update(UpdateBaseUserInput input)
         {
-            var entity = input.Adapt<BaseUser>();
-            await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+            //后台系统用户
+            var sysuser = await this._sysUserRep.SingleAsync(x => x.Id == UserManager.UserId);
+            if (sysuser == null)
+            {
+                throw Oops.Oh("修改失败!", sysuser);
             }
 
+            var user = this._rep.AsQueryable()
+               .Filter("TenantId", true)
+               .First(x => x.CreatedUserId == UserManager.UserId);
+            user.AvatarUrl = input.AvatarUrl;
+            sysuser.Avatar = input.AvatarUrl;
+            await this._sysUserRep.AsUpdateable(sysuser).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+            await this._rep.AsUpdateable(user).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
 
 
-
-
-
+        }
 
 
 

GDZZ.Application/Service/MiniBanner/Dto/MiniBannerDto.cs

@@ -0,0 +1,27 @@
+using System;
+using GDZZ.Core;
+
+namespace GDZZ.Application
+{
+    /// <summary>
+    /// 活动广告列表输出参数
+    /// </summary>
+    public class MiniBannerDto
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public long Id { get; set; }
+        
+        /// <summary>
+        /// 广告图片
+        /// </summary>
+        public string Url { get; set; }
+        
+        /// <summary>
+        /// 跳转链接
+        /// </summary>
+        public string Skip { get; set; }
+        
+    }
+}

GDZZ.Application/Service/MiniBanner/Dto/MiniBannerInput.cs

@@ -0,0 +1,58 @@
+using GDZZ.Core;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GDZZ.Application
+{
+    /// <summary>
+    /// 活动广告列表输入参数
+    /// </summary>
+    public class MiniBannerInput : PageInputBase
+    {
+        /// <summary>
+        /// 广告图片
+        /// </summary>
+        public virtual string Url { get; set; }
+        
+        /// <summary>
+        /// 跳转链接
+        /// </summary>
+        public virtual string Skip { get; set; }
+        
+    }
+
+    public class AddMiniBannerInput : MiniBannerInput
+    {
+        /// <summary>
+        /// 广告图片
+        /// </summary>
+        [Required(ErrorMessage = "广告图片不能为空")]
+        public override string Url { get; set; }
+        
+    }
+
+    public class DeleteMiniBannerInput
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Required(ErrorMessage = "主键Id不能为空")]
+        public long Id { get; set; }
+        
+    }
+
+    public class UpdateMiniBannerInput : MiniBannerInput
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Required(ErrorMessage = "主键Id不能为空")]
+        public long Id { get; set; }
+        
+    }
+
+    public class QueryeMiniBannerInput : DeleteMiniBannerInput
+    {
+
+    }
+}

GDZZ.Application/Service/MiniBanner/Dto/MiniBannerOutput.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace GDZZ.Application
+{
+    /// <summary>
+    /// 活动广告列表输出参数
+    /// </summary>
+    public class MiniBannerOutput
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public long Id { get; set; }
+        
+        /// <summary>
+        /// 广告图片
+        /// </summary>
+        public string Url { get; set; }
+        
+        /// <summary>
+        /// 跳转链接
+        /// </summary>
+        public string Skip { get; set; }
+        
+    }
+}

GDZZ.Application/Service/MiniBanner/IMiniBannerService.cs

@@ -0,0 +1,16 @@
+using GDZZ.Core;
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using GDZZ.Application.Entity;
+namespace GDZZ.Application
+{
+    public interface IMiniBannerService
+    {
+        Task Add(AddMiniBannerInput input);
+        Task Delete(DeleteMiniBannerInput input);
+        Task<MiniBanner> Get([FromQuery] QueryeMiniBannerInput input);
+        Task<dynamic> List([FromQuery] MiniBannerInput input);
+        Task<dynamic> Page([FromQuery] MiniBannerInput input);
+        Task Update(UpdateMiniBannerInput input);
+    }
+}

GDZZ.Application/Service/MiniBanner/MiniBannerService.cs

@@ -0,0 +1,96 @@
+using GDZZ.Core;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System.Linq;
+using System.Threading.Tasks;
+using GDZZ.Application.Entity;
+namespace GDZZ.Application
+{
+    /// <summary>
+    /// 活动广告列表服务
+    /// </summary>
+    [ApiDescriptionSettings("Application",Name = "MiniBanner", Order = 1)]
+    public class MiniBannerService : IMiniBannerService, IDynamicApiController, ITransient
+    {
+        private readonly SqlSugarRepository<MiniBanner> _rep;
+
+        public MiniBannerService(SqlSugarRepository<MiniBanner> rep)
+        {
+            _rep = rep;
+        }
+
+        /// <summary>
+        /// 分页查询活动广告列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("/MiniBanner/page")]
+        public async Task<dynamic> Page([FromQuery] MiniBannerInput input)
+        {
+            var entities = await _rep.AsQueryable()
+                                     .ToPagedListAsync(input.PageNo, input.PageSize);
+            return entities.XnPagedResult();
+        }
+
+        /// <summary>
+        /// 增加活动广告列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/MiniBanner/add")]
+        public async Task Add(AddMiniBannerInput input)
+        {
+            var entity = input.Adapt<MiniBanner>();
+            await _rep.InsertAsync(entity);
+        }
+
+        /// <summary>
+        /// 删除活动广告列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/MiniBanner/delete")]
+        public async Task Delete(DeleteMiniBannerInput input)
+        {
+            var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id);
+            await _rep.DeleteAsync(entity);
+        }
+
+        /// <summary>
+        /// 更新活动广告列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/MiniBanner/edit")]
+        public async Task Update(UpdateMiniBannerInput input)
+        {
+            var entity = input.Adapt<MiniBanner>();
+            await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns:true).ExecuteCommandAsync();
+        }
+
+        /// <summary>
+        /// 获取活动广告详情
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("/MiniBanner/detail")]
+        public async Task<MiniBanner> Get([FromQuery] QueryeMiniBannerInput input)
+        {
+            return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id);
+        }
+
+        /// <summary>
+        /// 获取活动广告列表列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("/Mini/Banner/list")]
+        public async Task<dynamic> List([FromQuery] MiniBannerInput input)
+        {
+            return await _rep.ToListAsync();
+        }
+    }
+}

GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs

@@ -25,7 +25,7 @@ namespace GDZZ.Application
         /// <summary>
         /// 待遇
         /// </summary>
-        public int Salary { get; set; }
+        public string Salary { get; set; }
         
         /// <summary>
         /// 详情
@@ -58,6 +58,11 @@ namespace GDZZ.Application
         /// </summary>
         public string RegionName { get; set; }
 
+        /// <summary>
+        /// 公司地区
+        /// </summary>
+        public string CompanyRegionName { get; set; }
+
         /// <summary>
         /// 经验
         /// </summary>

GDZZ.Web.Core/applicationconfig.json

@@ -8,7 +8,7 @@
   //  "DefaultRoutePrefix": "api666" //默认路由前缀，默认api，但是如果action上面写死route的话 就无效了特性的优先级最高
   //},
   "SystemSettings": {
-    "SuperAdminViewAllData": false, //超管是否可以查看所有租户的数据
+    "SuperAdminViewAllData": true, //超管是否可以查看所有租户的数据
     "IsGlobalRequestLog": false //是否开启全局请求日志
   },
   "AppSettings": {