From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/UserInfoService.cs | 93 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/UserInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/UserInfoService.cs"
index 453ff51..f4724bc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/UserInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/UserInfoService.cs"
@@ -5,17 +5,22 @@
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Const;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
+using WIDESEA_ISystemRepository;
using WIDESEA_Model.Models;
namespace WIDESEA_BasicService
{
public class UserInfoService : ServiceBase<Dt_UserInfo, IUserInfoRepository>, IUserInfoService
{
- public UserInfoService(IUserInfoRepository BaseDal) : base(BaseDal)
+ private readonly ISys_UserRepository _userRepository;
+ public UserInfoService(IUserInfoRepository BaseDal, ISys_UserRepository userRepository) : base(BaseDal)
{
+ _userRepository = userRepository;
}
public IUserInfoRepository Repository => BaseDal;
@@ -35,22 +40,61 @@
Name = model.Name,
State = model.State
};
-
+ Sys_User user = new Sys_User()
+ {
+ UserName = userInfo.Code,
+ RoleId = 0,
+ UserPwd = "TC123456".EncryptDES(AppSecret.User),
+ RoleName = "",
+ Enable = (byte)userInfo.State,
+ LastModifyPwdDate = DateTime.Now,
+ Address = "绯荤粺鏈嶅姟鍣�",
+ TenantId = 0,
+ Creater = "绯荤粺",
+ UserTrueName = userInfo.Name,
+ };
BaseDal.AddData(userInfo);
+ _userRepository.AddData(user);
}
else if (model.OperateType == "1")
{
Dt_UserInfo userInfo = BaseDal.QueryFirst(x => x.Code == model.Code);
if (userInfo == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒拌鍛樺伐鍙枫�恵model.Code}銆戜俊鎭�");
+ Dt_UserInfo userInfoAddNew = new Dt_UserInfo()
+ {
+ Code = model.Code,
+ DeptName = model.DeptName,
+ DeptNo = model.DeptNo,
+ InvOrgId = model.InvOrgId,
+ Name = model.Name,
+ State = model.State
+ };
+ Sys_User userAddNew = new Sys_User()
+ {
+ UserName = userInfo.Code,
+ RoleId = 0,
+ UserPwd = "TC123456".EncryptDES(AppSecret.User),
+ RoleName = "",
+ Enable = (byte)userInfo.State,
+ LastModifyPwdDate = DateTime.Now,
+ Address = "绯荤粺鏈嶅姟鍣�",
+ TenantId = 0,
+ Creater = "绯荤粺",
+ UserTrueName = userInfo.Name,
+ };
+ BaseDal.AddData(userInfoAddNew);
+ _userRepository.AddData(userAddNew);
}
- userInfo.State = model.State;
- userInfo.DeptName = model.DeptName;
- userInfo.DeptNo = model.DeptNo;
- userInfo.InvOrgId = model.InvOrgId;
- userInfo.Name = model.Name;
- BaseDal.UpdateData(userInfo);
+ else
+ {
+ userInfo.State = model.State;
+ userInfo.DeptName = model.DeptName;
+ userInfo.DeptNo = model.DeptNo;
+ userInfo.InvOrgId = model.InvOrgId;
+ userInfo.Name = model.Name;
+ BaseDal.UpdateData(userInfo);
+ }
}
else if (model.OperateType == "2")
{
@@ -68,5 +112,36 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ public WebResponseContent AddUser()
+ {
+ try
+ {
+ List<Dt_UserInfo> userInfos = BaseDal.QueryData().Where(x=>x.Code!= "Admin").ToList();
+ List<Sys_User> userList = new List<Sys_User>();
+ foreach (var item in userInfos)
+ {
+ Sys_User user = new Sys_User()
+ {
+ UserName = item.Code,
+ RoleId = 0,
+ UserPwd="TC123456".EncryptDES(AppSecret.User),
+ RoleName ="",
+ Enable=(byte)item.State,
+ LastModifyPwdDate=DateTime.Now,
+ Address= "绯荤粺鏈嶅姟鍣�",
+ TenantId=0,
+ Creater= "绯荤粺",
+ UserTrueName=item.Name,
+ };
+ userList.Add(user);
+ }
+ _userRepository.AddData(userList);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
}
}
--
Gitblit v1.9.3