VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -44,7 +44,7 @@
                }
                if (userName != "" && userName != null)
                {
                    search += "and parent.lm_user like '%'+@userName+'%' ";
                    search += "and U.username like '%'+@userName+'%' ";
                    dynamicParams.Add("@userName", userName);
                }
                if (search == "")
@@ -62,10 +62,12 @@
                            parent.parent_id,
                            child.org_code as parentorg_code, 
                            child.org_name as parentorg_name,
                            parent.lm_user,
                            U.username as lm_user,
                            parent.lm_date
                            from TOrganization as parent 
                            left join TOrganization as child on parent.parent_id=child.id where parent.is_delete<>1 " + search;
                            left join TOrganization as child on parent.parent_id=child.id
                            left join TUser U on parent.lm_user=U.usercode
                            where parent.is_delete<>1 " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -154,7 +156,19 @@
            {
                if (operType == "Add")
                {
                     sql = @"insert into TOrganization(parent_id,org_code,org_name,lm_user,lm_date,description)
                    sql = @"select *  from TOrganization where org_code=@organCode";
                    dynamicParams.Add("@organCode", organCode);
                    var data = DapperHelper.selectdata(sql, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "新增操作失败,编码重复!";
                        mes.data = null;
                        return mes;
                    }
                    sql = @"insert into TOrganization(parent_id,org_code,org_name,lm_user,lm_date,description)
                            values(@supUnit,@organCode,@organName,@Operator,@CreateDate,@organType)";
                    list.Add(new { str = sql, parm = new { supUnit = supUnit, organCode= organCode, organName= organName, Operator= Operator, CreateDate= DateTime.Now.ToString(), organType= organType } });
                    //sql = @"update T_CodeRules set value=@cunm2  where rightcode=@RightCode";
@@ -220,7 +234,7 @@
            var dynamicParams = new DynamicParameters();
            try
            {
                sql = @"select * from  TOrganization  where parent_id=@orgid";
                sql = @"select * from  TOrganization  where parent_id=@orgid and is_delete<>'1'";
                dynamicParams.Add(@"orgid", orgid);
                cont = DapperHelper.selectcount(sql, dynamicParams);
                if (cont>0)
@@ -276,7 +290,7 @@
                }
                if (UserName != "" && UserName != null)
                {
                    search += "and u.username like '%'+@UserName+'%' ";
                    search += "and S.username like '%'+@UserName+'%' ";
                    dynamicParams.Add("@UserName", UserName);
                }
                if (StuOrg != "" && StuOrg != null)
@@ -301,11 +315,12 @@
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,u.password,u.mobile,u.email,u.wagetype,u.enable,u.lm_user,u.lm_date,u.is_role
                var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,u.password,u.mobile,u.email,u.wagetype,u.enable,S.username as lm_user,u.lm_date,u.is_role
                            from TUser u
                            left join TOrganization t on u.stu_torgcode=t.org_code 
                            left join TGroup g on u.usergroup_code=g.group_code
                            where u.is_delete<>1 " + search;
                            left join TUser S on u.lm_user=S.usercode
                            where u.is_delete='0' and u.userclassid='0' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -332,7 +347,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 +431,27 @@
        #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 sql0 = @"select *  from TUser where usercode=@UserCode";
                    dynamicParams.Add("@UserCode", UserCode);
                    var data = DapperHelper.selectdata(sql0, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "新增操作失败,编码重复!";
                        mes.data = null;
                        return mes;
                    }
                    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 +462,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 +481,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 +492,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)
                    {
@@ -560,7 +589,7 @@
                {
                    sql = @"select B.role_code as code,B.role_name as name,(case when C.role_code is null then 'N' else 'Y' end) flag from TRole B 
                             left join(select role_code  from TUserRoleRelation where user_code=@usercode) C on B.role_code=C.role_code
                             where B.roletype_code=@roletype_code  and B.is_delete='0'";
                             where B.roletype_code=@roletype_code  and B.is_delete='0' and B.is_system='0'";
                    dynamicParams.Add("@roletype_code", data[i].code);
                    dynamicParams.Add("@usercode", usercode);
                    var data0 = DapperHelper.select<TreeObejctCn>(sql, dynamicParams);
@@ -759,6 +788,17 @@
                //循环写入用户组表
                for (int i = 0; i < json.Count; i++)
                {
                    var sql0 = @"select *  from TGroup where group_code=@group_code";
                    dynamicParams.Add("@group_code", json[i].code);
                    var data = DapperHelper.selectdata(sql0, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败,编码重复!";
                        mes.data = null;
                        return mes;
                    }
                    sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date) values(@groupcode,@groupename,@description,@lm_user,@lm_date)";
                    list.Add(new
                    {
@@ -894,6 +934,17 @@
                //循环写入角色类型表
                for (int i = 0; i < json.Count; i++)
                {
                    var sql0 = @"select *  from TRoleType where roletype_code=@roletype_code";
                    dynamicParams.Add("@roletype_code", json[i].code);
                    var data = DapperHelper.selectdata(sql0, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败,编码重复!";
                        mes.data = null;
                        return mes;
                    }
                    sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
                    list.Add(new
                    {
@@ -1019,7 +1070,7 @@
                }
                if (CreateUser != "" && CreateUser != null)
                {
                    search += "and A.lm_user like '%'+@CreateUser+'%' ";
                    search += "and T.username like '%'+@CreateUser+'%' ";
                    dynamicParams.Add("@CreateUser", CreateUser);
                }
                if (search == "")
@@ -1029,10 +1080,11 @@
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,A.lm_user,A.lm_date,A.is_user,A.is_right
                var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,T.username as lm_user,A.lm_date,A.is_user,A.is_right
                            from TRole A
                            left join TRoleType  B on A.roletype_code=B.roletype_code
                            where  A.is_delete<>'1' " + search;
                            left join TUser T on A.lm_user=T.usercode
                            where  A.is_delete='0' and A.is_system='0' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -1058,6 +1110,17 @@
            {
                if (OperType == "Add")
                {
                    var sql0 = @"select *  from TRole where role_code=@role_code";
                    dynamicParams.Add("@role_code", RoleCode);
                    var data = DapperHelper.selectdata(sql0, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败,编码重复!";
                        mes.data = null;
                        return mes;
                    }
                    var sql = @"insert into TRole(role_code,role_name,lm_user,lm_date,roletype_code,description) 
                            values(@RoleCode,@RoleName,@Usercode,@CreateDate,@RoleTypeCode,@description)";
                    dynamicParams.Add("@RoleCode", RoleCode);
@@ -1207,7 +1270,7 @@
                             left join TOrganization B on A.stu_torgcode=B.org_code
                             left join (
                                select distinct user_code  from TUserRoleRelation where role_code=@rolecode
                             ) C on A.usercode=C.user_code where A.is_delete<>'1' " + search;
                             ) C on A.usercode=C.user_code where A.is_delete='0' and A.userclassid='0' " + search;
                dynamicParams.Add("@rolecode", rolecode);
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -1257,7 +1320,9 @@
        public static ToMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
        {
            var sql = "";
            var sql2 = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
@@ -1269,6 +1334,7 @@
                    //标记角色表关联用户标识
                    sql = @"update TRole set is_user='N' where role_code=@rolecode";
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                }
                else
                {
@@ -1426,12 +1492,12 @@
            {
                if (cuntUnitCode != "" && cuntUnitCode != null)
                {
                    search += "and code like '%'+@cuntUnitCode+'%' ";
                    search += "and A.code like '%'+@cuntUnitCode+'%' ";
                    dynamicParams.Add("@cuntUnitCode", cuntUnitCode);
                }
                if (cuntUnitName != "" && cuntUnitName != null)
                {
                    search += "and name like '%'+@cuntUnitName+'%' ";
                    search += "and A.name like '%'+@cuntUnitName+'%' ";
                    dynamicParams.Add("@cuntUnitName", cuntUnitName);
                }
                if (unitAttr != "" && unitAttr != null)
@@ -1439,22 +1505,22 @@
                    switch (unitAttr)
                    {
                        case "WG":  //外购
                            search += "and mtype=@unitAttr ";
                            search += "and A.mtype=@unitAttr ";
                            dynamicParams.Add("@unitAttr", unitAttr);
                            break;
                        case "WX":  //外协
                            search += "and btype=@unitAttr ";
                            search += "and A.btype=@unitAttr ";
                            dynamicParams.Add("@unitAttr", unitAttr);
                            break;
                        default:    //客户
                            search += "and htype=@unitAttr ";
                            search += "and A.htype=@unitAttr ";
                            dynamicParams.Add("@unitAttr", unitAttr);
                            break;
                    }
                }
                if (createUser != "" && createUser != null)
                {
                    search += "and lm_user like '%'+@createUser+'%' ";
                    search += "and T.username like '%'+@createUser+'%' ";
                    dynamicParams.Add("@createUser", createUser);
                }
                if (search == "")
@@ -1463,8 +1529,9 @@
                }
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select id,code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date from TCustomer
                            where  is_delete<>'1' " + search;
                var sql = @"select A.id,A.code,A.name,A.mtype,A.btype,A.htype,A.conttacts,A.conttphone,A.addr,T.username as lm_user,A.lm_date from TCustomer A
                            left join TUser T on A.lm_user=T.usercode
                            where  A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -1490,6 +1557,17 @@
            {
                if (OperType == "Add")
                {
                    var sql0 = @"select *  from TCustomer where code=@unitcode";
                    dynamicParams.Add("@unitcode", unitcode);
                    var data = DapperHelper.selectdata(sql0, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败,编码重复!";
                        mes.data = null;
                        return mes;
                    }
                    var sql = @"insert into TCustomer(code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date) 
                            values(@unitcode,@unitname,@mtypecode,@btypecode,@htypecode,@person,@contact,@description,@usercode,@CreateDate)";
                    dynamicParams.Add("@unitcode", unitcode);
@@ -1579,8 +1657,8 @@
                    mes.data = null;
                    return mes;
                }
                //删除(更新状态)往来单位表
                sql = @"update TCustomer set is_delete='1'  where code=@unitcode";
                //删除往来单位表
                sql = @"delete TCustomer   where code=@unitcode";
                list.Add(new { str = sql, parm = new { unitcode = unitcode } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)