From c63b40452aeaf1b46ef716da9f5dc9e8c2a843a6 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 七月 2022 20:30:33 +0800
Subject: [PATCH] 生产开报工提交

---
 VueWebApi/DLL/DAL/BasicSettingDAL.cs |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 1706b06..94c473a 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -332,7 +332,7 @@
             {
                 List<TreeDG> list = new List<TreeDG>();
                 sql = @"select id,parent_id,org_code,org_name,description  
-                      FROM TOrganization ";
+                      FROM TOrganization where is_delete<>'1'";
                 var dt = DapperHelper.selectdata(sql, dynamicParams);
                 for (int i = 0; i < dt.Rows.Count; i++)   //杩欓噷鏄惊鐜墍鏈�
                 {
@@ -416,15 +416,15 @@
         #endregion
 
         #region[鐢ㄦ埛娓呭崟鏂板缂栬緫]
-        public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName,string Password, string Enable, string StuOrg, string wagetype, string Mobile, string Email, string Operator, string OperType)
+        public static ToMessage AddUpdateUser(string UserId, string UserCode, string UserName,string Password, string Enable, string StuOrg,string groupcode, string wagetype, string Mobile, string Email, string Operator, string OperType)
         {
             var dynamicParams = new DynamicParameters();
             try
             {
                 if (OperType == "Add")
                 {
-                    var sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype) 
-                            values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype)";
+                    var sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype,usergroup_code) 
+                            values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype,@groupcode)";
                     dynamicParams.Add("@UserCode", UserCode);
                     dynamicParams.Add("@UserName", UserName);
                     dynamicParams.Add("@password", Password);
@@ -435,6 +435,7 @@
                     dynamicParams.Add("@Operator", Operator);
                     dynamicParams.Add("@StuOrg", StuOrg);
                     dynamicParams.Add("@wagetype", wagetype);
+                    dynamicParams.Add("@groupcode", groupcode);
                     int cont = DapperHelper.SQL(sql, dynamicParams);
                     if (cont > 0)
                     {
@@ -453,7 +454,7 @@
                 }
                 if (OperType == "Update")
                 {
-                    var sql = @"update TUser set username=@UserName,password=@password,enable=@Enable,mobile=@Mobile,lm_user=@Operator,email=@Email,stu_torgcode=@StuOrg,wagetype=@wagetype,lm_date=@CreateDate where id=@UserId";
+                    var sql = @"update TUser set username=@UserName,password=@password,enable=@Enable,mobile=@Mobile,lm_user=@Operator,email=@Email,stu_torgcode=@StuOrg,wagetype=@wagetype,usergroup_code=@groupcode,lm_date=@CreateDate where id=@UserId";
                     dynamicParams.Add("@UserId", UserId);
                     dynamicParams.Add("@UserName", UserName);
                     dynamicParams.Add("@password", Password);
@@ -464,6 +465,7 @@
                     dynamicParams.Add("@Operator", Operator);
                     dynamicParams.Add("@StuOrg", StuOrg);
                     dynamicParams.Add("@wagetype", wagetype);
+                    dynamicParams.Add("@groupcode", groupcode);
                     int cont = DapperHelper.SQL(sql, dynamicParams);
                     if (cont > 0)
                     {

--
Gitblit v1.9.3