更新用户管理，增加工号，是否项目录入，问答录入，预发工资，保底年薪，工龄工资，是否交通补贴，界面调整。

LR-20210131IOQH\Administrator

2021-06-08 f7841c1dc1cd7f0a80d0cc77cc54481d0a8bb707

 zhengcaioa/zhengcaioa/Controllers/UserController.cs

@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Transactions;
using zhengcaioa.IService;
@@ -171,7 +172,6 @@
            }
            ViewBag.shenfenzheng = resultshenfenzheng;


            ResultDataEntity<SysAttachmentDTO> resultshenfenzhengbeimian = new ResultDataEntity<SysAttachmentDTO>();
            if (!string.IsNullOrEmpty(id))
            {
@@ -183,8 +183,6 @@
                resultshenfenzhengbeimian = _sysAttachmentService.SearchByPaging(searchEntity);
            }
            ViewBag.shenfenzhengbeimian = resultshenfenzhengbeimian;



            ResultDataEntity<SysAttachmentDTO> resultsxuelizheng = new ResultDataEntity<SysAttachmentDTO>();
            if (!string.IsNullOrEmpty(id))
@@ -226,10 +224,6 @@
        }


       
       


        [CheckLogin]
        public string Get(string id = null)
        {
@@ -258,6 +252,11 @@
            ViewData["curentuser"] = curentuser;
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;

            string s = @"^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$";
            Regex rStr = new Regex(s);
            if (rStr.IsMatch(userdata.IpMac))
            {
            using (TransactionScope scope = new TransactionScope())
            {

@@ -329,14 +328,15 @@
                                return JsonConvert.SerializeObject(resultEntity);
                            }
                        }

                    }


                }
                scope.Complete();
            }

            }
            else
            {
                resultEntity.Message = "MAC地址格式错误";
            }
            return JsonConvert.SerializeObject(resultEntity);
        }
        #endregion