1

dengjunjie

2025-05-08 092971a8ba7848f024427694c642959d0fbc8599

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs

@@ -11,6 +11,10 @@
using WIDESEAWCS_Core.BaseRepository;
using System.Net;
using WIDESEAWCS_Core.Caches;
using System.Drawing.Drawing2D;
using WIDESEAWCS_SystemServices.System;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using Newtonsoft.Json;

namespace WIDESEAWCS_SystemServices
{
@@ -18,12 +22,41 @@
    {
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly ICacheService _cacheService;
        public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService) : base(repository)
        private readonly ISys_MenuService _menuService;
        private readonly ISys_RoleService _sys_RoleService;
        public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_RoleService sys_RoleService, ISys_MenuService menuService) : base(repository)
        {
            _unitOfWorkManage = unitOfWorkManage;
            _cacheService = cacheService;
            _sys_RoleService = sys_RoleService;
            _menuService = menuService;
        }
        //public override PageGridData<Sys_User> GetPageData(PageDataOptions options)
        //{
        //    var roleIds = _sys_RoleService.GetAllChildren(App.User.RoleId).Select(x => x.Id);
        //    PageGridData<Sys_User> pageGridData = new PageGridData<Sys_User>();
        //    //树形菜单传查询角色下所有用户
        //    if (App.User.IsSuperAdmin)
        //    {
        //        var GridData = base.GetPageData(options);
        //        pageGridData = new PageGridData<Sys_User>()
        //        {
        //            Rows = options.Order?.ToLower() == "asc" ? GridData.Rows.OrderBy(x => x.Role_Id).ToList() : GridData.Rows,
        //            Total = GridData.Total
        //        };
        //        return pageGridData;
        //    }
        //    string where = ValidatePageOptions(options);
        //    var a = BaseDal.Db.Queryable<Sys_User>().Where(x => roleIds.Contains(x.Role_Id)).Where(where);
        //    int total = 0;
        //    pageGridData = new PageGridData<Sys_User>()
        //    {
        //        Rows = BaseDal.Db.Queryable<Sys_User>().Where(x => roleIds.Contains(x.Role_Id)).Where(where).ToPageList(options.Page, options.Rows),
        //        Total = total
        //    };

        //    return pageGridData;
        //}
        public WebResponseContent Login(LoginInfo loginInfo)
        {
            WebResponseContent content = new WebResponseContent();
@@ -47,6 +80,10 @@
                UserInfo user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
                if (user != null)
                {
                    object obj = _menuService.GetMenuActionList(user.RoleId);
                    #region åˆ¤æ–­å½“前用户是否启用
                    if (BaseDal.QueryFirst(x => x.User_Id == user.UserId, s => s.Enable) != 1) throw new Exception($"账号{user.UserName}禁止使用,请联系管理员");
                    #endregion
                    string token = JwtHelper.IssueJwt(new TokenModelJwt()
                    {
                        UserId = user.UserId,
@@ -74,6 +111,21 @@

        public override WebResponseContent UpdateData(SaveModel saveModel)
        {
            //var User1 = JsonConvert.DeserializeObject<Sys_User>(JsonConvert.SerializeObject(GetCurrentUserInfo().Data));
            var User = JsonConvert.DeserializeObject<Sys_User>(GetCurrentUserInfo().Data.ToJson());

            #region åªèƒ½ä¿®æ”¹æ¯”当前用户角色等级低的用户
            int userId = saveModel.MainData[nameof(Sys_User.User_Id).FirstLetterToLower()].ObjToInt();
            int RoleId = saveModel.MainData[nameof(Sys_User.Role_Id).FirstLetterToLower()].ObjToInt();
            var user = BaseDal.QueryFirst(x => x.User_Id == userId);
            if (User.User_Id == user.User_Id && User.Role_Id != RoleId) return WebResponseContent.Instance.Error("不可修改自己的角色");
            if (User.User_Id != user.User_Id && User.Role_Id >= RoleId) return WebResponseContent.Instance.Error("权限等级不足");
            if (User.Role_Id > user.Role_Id || User.Role_Id == user.Role_Id && User.User_Id != userId) return WebResponseContent.Instance.Error("暂无修改权限");
            //if (User.User_Id != userId) return WebResponseContent.Instance.Error("暂无修改权限");只限当前用户修改
            #endregion

            saveModel.MainData[nameof(Sys_User.UserPwd).FirstLetterToLower()] = User.UserPwd;
            //saveModel.MainData[nameof(Sys_User.UserPwd).FirstLetterToLower()] = App.User.TenantId;
            UpdateIgnoreColOnExecute = x =>
            {
                return new List<string>
@@ -111,6 +163,9 @@
            var data = BaseDal.QueryFirst(x => x.User_Id == App.User.UserId, s => new
            {
                s.UserName,
                s.Role_Id,
                s.User_Id,
                s.UserPwd,
                s.UserTrueName,
                s.Address,
                s.PhoneNo,
@@ -129,7 +184,7 @@
        /// </summary>
        /// <param name="parameters"></param>
        /// <returns></returns>
        public WebResponseContent ModifyPwd(string oldPwd, string newPwd)
        public WebResponseContent ModifyPwd(string oldPwd, string newPwd, string userName)
        {
            WebResponseContent content = WebResponseContent.Instance;
            oldPwd = oldPwd?.Trim();
@@ -141,19 +196,22 @@
                if (string.IsNullOrEmpty(newPwd)) return WebResponseContent.Instance.Error("新密码不能为空");
                if (newPwd.Length < 6) return WebResponseContent.Instance.Error("密码不能少于6位");

                int userId = App.User.UserId;
                string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == userId, s => s.UserPwd);
                //int userId = App.User.UserId;
                //string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == userId, s => s.UserPwd);
                var User = JsonConvert.DeserializeObject<Sys_User>(GetCurrentUserInfo().Data.ToJson());

                if (User.UserName != userName) return WebResponseContent.Instance.Error($"非本人不可修改密码");

                string _oldPwd = oldPwd.EncryptDES(AppSecret.User);
                if (_oldPwd != userCurrentPwd) return WebResponseContent.Instance.Error("旧密码不正确");
                if (_oldPwd != User.UserPwd) return WebResponseContent.Instance.Error("旧密码不正确");

                string _newPwd = newPwd.EncryptDES(AppSecret.User);
                if (userCurrentPwd == _newPwd) return WebResponseContent.Instance.Error("新密码不能与旧密码相同");
                if (User.UserPwd == _newPwd) return WebResponseContent.Instance.Error("新密码不能与旧密码相同");


                BaseDal.UpdateData(new Sys_User
                {
                    User_Id = userId,
                    User_Id = User.User_Id,
                    UserPwd = _newPwd,
                    LastModifyPwdDate = DateTime.Now
                }, new List<string>