From 1f1c2ecd4d216d165703d1f418eaa1691aa5a86a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 八月 2024 16:37:39 +0800
Subject: [PATCH] 提交
---
cylsg/cylsg.Application/Users/UserAppService.cs | 114 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 16 deletions(-)
diff --git a/cylsg/cylsg.Application/Users/UserAppService.cs b/cylsg/cylsg.Application/Users/UserAppService.cs
index baf8708..7acfbe1 100644
--- a/cylsg/cylsg.Application/Users/UserAppService.cs
+++ b/cylsg/cylsg.Application/Users/UserAppService.cs
@@ -52,10 +52,18 @@
userDto = _mapper.Map<UserDto>(user);
var userWorker = await userWorkerRes.GetFirstAsync(p=>p.UserId== userid);
- userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker);
-
+ if (userWorker != null)
+ {
+ userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker);
+ }
+
+
var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);
- userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);
+ if (userCompany != null)
+ {
+ userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);
+ }
+
@@ -72,12 +80,41 @@
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
}
-
+
+ if (!string.IsNullOrEmpty(userWorkerDto.IdCardFace) && userWorkerDto.IdCardFace.Length > 500)
+ {
+ throw Oops.Oh("韬唤璇佹闈㈣矾寰勯暱搴﹁繃闀匡紒");
+ }
+ if (!string.IsNullOrEmpty(userWorkerDto.IdCardBack) && userWorkerDto.IdCardBack.Length > 500)
+ {
+ throw Oops.Oh("韬唤璇佸弽闈㈣矾寰勯暱搴﹁繃闀匡紒");
+ }
+ if (!string.IsNullOrEmpty(userWorkerDto.name) && userWorkerDto.name.Length > 100)
+ {
+ throw Oops.Oh("濮撳悕闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userWorkerDto.Phone) && userWorkerDto.Phone.Length > 30)
+ {
+ throw Oops.Oh("鐢佃瘽鍙风爜闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userWorkerDto.IdCode) && userWorkerDto.IdCode.Length > 30)
+ {
+ throw Oops.Oh("韬唤璇佸彿闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userWorkerDto.Address) && userWorkerDto.Address.Length > 500)
+ {
+ throw Oops.Oh("鑱旂郴鍦板潃闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userWorkerDto.Resume) && userWorkerDto.Resume.Length > 2000)
+ {
+ throw Oops.Oh("绠�鍘嗘弿杩伴暱搴﹁繃闀匡紒");
+ }
+
var userWorkerRes = new BaseRepository<UserWorker>();
bool res;
if (userWorkerDto.Id > 0)
@@ -91,7 +128,7 @@
userWorker1.Address = userWorkerDto.Address;
userWorker1.Resume = userWorkerDto.Resume;
- userWorker1.UpDataBy = ITCode;
+ userWorker1.UpDataBy = NickName;
userWorker1.UpDataTime = DateTime.Now;
res = await userWorkerRes.UpdateAsync(userWorker1);
@@ -100,9 +137,9 @@
else
{
var userWorker = _mapper.Map<UserWorker>(userWorkerDto);
- userWorker.UpDataBy = ITCode;
+ userWorker.UpDataBy = NickName;
userWorker.UpDataTime = DateTime.Now;
- userWorker.CreateBy = ITCode;
+ userWorker.CreateBy = NickName;
userWorker.CreateTime = DateTime.Now;
userWorker.UserId = userid;
res = await userWorkerRes.InsertAsync(userWorker);
@@ -129,12 +166,44 @@
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
}
-
+ if(!string.IsNullOrEmpty(userCompanyDto.BusinessLicense) && userCompanyDto.BusinessLicense.Length > 500)
+ {
+ throw Oops.Oh("钀ヤ笟鎵х収璺緞闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userCompanyDto.Suppliername) && userCompanyDto.Suppliername.Length > 100)
+ {
+ throw Oops.Oh("浼佷笟鍚嶇О闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userCompanyDto.Regtime) && userCompanyDto.Regtime.Length > 50)
+ {
+ throw Oops.Oh("娉ㄥ唽鏃堕棿闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userCompanyDto.Address) && userCompanyDto.Address.Length > 500)
+ {
+ throw Oops.Oh("鑱旂郴鍦板潃闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userCompanyDto.Suppliercode) && userCompanyDto.Suppliercode.Length > 30)
+ {
+ throw Oops.Oh("浼佷笟娉ㄥ唽鍙烽暱搴﹁繃闀匡紒");
+ }
+ if (!string.IsNullOrEmpty(userCompanyDto.Contact) && userCompanyDto.Contact.Length > 50)
+ {
+ throw Oops.Oh("鑱旂郴浜洪暱搴﹁繃闀匡紒");
+ }
+ if (!string.IsNullOrEmpty(userCompanyDto.Phone) && userCompanyDto.Phone.Length > 50)
+ {
+ throw Oops.Oh("鑱旂郴鐢佃瘽闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userCompanyDto.Resume) && userCompanyDto.Resume.Length > 2000)
+ {
+ throw Oops.Oh("鍏徃绠�浠嬮暱搴﹁繃闀匡紒");
+ }
+
var userCompanyRes = new BaseRepository<UserCompany>();
bool res;
if (userCompanyDto.Id > 0)
@@ -150,7 +219,7 @@
userCompany1.Resume = userCompanyDto.Resume;
- userCompany1.UpDataBy = ITCode;
+ userCompany1.UpDataBy = NickName;
userCompany1.UpDataTime = DateTime.Now;
res = await userCompanyRes.UpdateAsync(userCompany1);
@@ -159,9 +228,9 @@
else
{
var userCompany = _mapper.Map<UserCompany>(userCompanyDto);
- userCompany.UpDataBy = ITCode;
+ userCompany.UpDataBy = NickName;
userCompany.UpDataTime = DateTime.Now;
- userCompany.CreateBy = ITCode;
+ userCompany.CreateBy = NickName;
userCompany.CreateTime = DateTime.Now;
userCompany.UserId = userid;
res = await userCompanyRes.InsertAsync(userCompany);
@@ -191,12 +260,25 @@
var user = await userRes.GetByIdAsync(userid);
userDto = _mapper.Map<UserDto>(user);
+ //var userWorker = await userWorkerRes.GetFirstAsync(p => p.UserId == userid);
+ //userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker);
+
+ //var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);
+ //userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);
+
+
var userWorker = await userWorkerRes.GetFirstAsync(p => p.UserId == userid);
- userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker);
+ if (userWorker != null)
+ {
+ userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker);
+ }
+
var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);
- userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);
-
+ if (userCompany != null)
+ {
+ userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);
+ }
return userDto;
--
Gitblit v1.9.1