From 2f91cbefebb537819abc851a3c17a08c691055f4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 27 七月 2022 20:55:31 +0800
Subject: [PATCH] 大岛车间综合看板接口
---
VueWebApi/Controllers/BasicSettingController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index b42caee..8be5193 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -171,12 +171,13 @@
string Password = obj["Password"].ToString(); //瀵嗙爜
string Enable = obj["Enable"].ToString(); //鍦ㄨ亴鐘舵��
string StuOrg = obj["StuOrg"].ToString(); //閫夋嫨缁勭粐缂栫爜
+ string groupcode= obj["groupcode"].ToString(); //鎵�灞炵彮缁勭紪鐮�
string wagetype = obj["wagetype"].ToString(); //宸ヨ祫绫诲瀷
string Mobile = obj["Mobile"].ToString(); //鑱旂郴鏂瑰紡
string Email = obj["Email"].ToString(); //鐢靛瓙閭
string Operator = obj["Operator"].ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateUser(UserId, UserCode, UserName, Password, Enable, StuOrg, wagetype, Mobile, Email, Operator, OperType);
+ mes = BasicSettingBLL.AddUpdateUser(UserId, UserCode, UserName, Password, Enable, StuOrg, groupcode, wagetype, Mobile, Email, Operator, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -238,7 +239,7 @@
/// <returns></returns>
[Route(template: "ImportUserExcel")]
[HttpPost]
- public HttpResponseMessage ImportUserExcel(HttpPostedFileBase files)
+ public HttpResponseMessage ImportUserExcel(HttpPostedFileBase files,string username)
{
string savePath;
if (files == null || files.ContentLength <= 0)
@@ -248,7 +249,6 @@
}
else
{
- var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鐧诲綍鐢ㄦ埛鍚�
string filename = Path.GetFileName(files.FileName);
int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
string fileEx = System.IO.Path.GetExtension(filename);//鑾峰彇涓婁紶鏂囦欢鐨勬墿灞曞悕
@@ -620,7 +620,7 @@
string person = obj["person"].ToString(); //鑱旂郴浜�
string contact = obj["contact"].ToString(); //鑱旂郴鏂瑰紡
string description = obj["description"].ToString(); //琛ュ厖鎻忚堪
- var usercode = "Admin";//HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, mtypecode, btypecode,htypecode, person, contact, description, usercode, OperType);
return TJson.toJson(mes);
--
Gitblit v1.9.3