Merge branch 'master' of http://git.dongkesoft.cn:8000/MES/HEGII.ss.mes.web

wwwroot/mes/mst/user/user.ashx

@@ -175,7 +175,8 @@ public class user : IHttpHandler, IReadOnlySessionState
                     m.CREATEUSERID,
                     m.CREATETIME,
                     m.UPDATEUSERID,
-                    m.UPDATETIME
+                    m.UPDATETIME,
+                    m.AD_USER_CODE
                 FROM
                     TP_MST_USER m
                     LEFT JOIN TP_MST_ORGANIZATION o ON o.ORGANIZATIONID = m.ORGANIZATIONID 
@@ -334,7 +335,8 @@ public class user : IHttpHandler, IReadOnlySessionState
                     m.CREATEUSERID,
                     m.CREATETIME,
                     m.UPDATEUSERID,
-                    m.UPDATETIME
+                    m.UPDATETIME,
+                    m.AD_USER_CODE
                 FROM
                     TP_MST_USER m
                 WHERE 
@@ -362,6 +364,26 @@ public class user : IHttpHandler, IReadOnlySessionState
             //MD5加密密码
             string passWord = FormsAuthentication.HashPasswordForStoringInConfigFile(form["PASSWORD"], "MD5");
 
+            //AD域
+            string AD_USER_CODE = form["AD_USER_CODE"];
+            if (!string.IsNullOrEmpty(AD_USER_CODE))
+            {
+                //校验AD域是否已存在
+                string sqlStr = @"SELECT 1
+                              FROM tp_mst_user
+                             WHERE accountid = @accountid@
+                               AND valueflag = 1
+                               AND ad_user_code = @ad_user_code@";
+                List<CDAParameter> sqlPara = new List<CDAParameter>();
+                sqlPara.Add(new CDAParameter("accountid", HttpContext.Current.Session["accountId"]));
+                sqlPara.Add(new CDAParameter("ad_user_code", AD_USER_CODE));
+                DataTable dtcheck = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+                if (dtcheck.Rows.Count > 0)
+                {
+                    return new JsonResult(JsonStatus.error) { message = "AD域已存在" }.ToJson();
+                }
+            }
+
             int result = conn.ExecuteNonQuery(@"
                 INSERT INTO TP_MST_USER (
                     --USERID,
@@ -385,6 +407,7 @@ public class user : IHttpHandler, IReadOnlySessionState
                     ISGROUTINGWORKER,
                     PLCID,
                     ACCOUNTID,CREATEUSERID,UPDATEUSERID
+                    ,AD_USER_CODE
                 ) VALUES (
                     --@USERID@,
                     @USERCODE@,
@@ -407,6 +430,7 @@ public class user : IHttpHandler, IReadOnlySessionState
                     @ISGROUTINGWORKER@,
                     @PLCID@,
                     @ACCOUNTID@,@CREATEUSERID@,@UPDATEUSERID@
+                    ,@AD_USER_CODE@
                 )
                 ",
                 //new CDAParameter("USERID",primaryKey),
@@ -431,7 +455,8 @@ public class user : IHttpHandler, IReadOnlySessionState
                 new CDAParameter("ACCOUNTID",HttpContext.Current.Session["accountId"]),
                 new CDAParameter("ACCOUNTCODE",HttpContext.Current.Session["accountCode"]),
                 new CDAParameter("CREATEUSERID",HttpContext.Current.Session["userId"]),
-                new CDAParameter("UPDATEUSERID",HttpContext.Current.Session["userId"])
+                new CDAParameter("UPDATEUSERID",HttpContext.Current.Session["userId"]),
+                new CDAParameter("AD_USER_CODE",AD_USER_CODE)
             );
             return new JsonResult(JsonStatus.success).ToJson();
         }
@@ -449,6 +474,28 @@ public class user : IHttpHandler, IReadOnlySessionState
 
         using(IDataAccess conn=DataAccess.Create())
         {
+             //验证ad域是否已存在
+            string AD_USER_CODE = form["AD_USER_CODE"];
+            if (!string.IsNullOrEmpty(AD_USER_CODE))
+            {
+                //校验AD域是否已存在
+                string sqlStr = @"SELECT 1
+                              FROM tp_mst_user
+                             WHERE accountid = @accountid@
+                               AND valueflag = 1
+                               AND USERID <> @USERID@
+                               AND ad_user_code = @ad_user_code@";
+                List<CDAParameter> sqlPara = new List<CDAParameter>();
+                sqlPara.Add(new CDAParameter("accountid", HttpContext.Current.Session["accountId"]));
+                sqlPara.Add(new CDAParameter("ad_user_code", AD_USER_CODE));
+                sqlPara.Add(new CDAParameter("USERID", HttpContext.Current.Request["id"]));
+                DataTable dtcheck = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+                if (dtcheck.Rows.Count > 0)
+                {
+                    return new JsonResult(JsonStatus.error) { message = "AD域已存在" }.ToJson();
+                }
+            }
+
             int result = conn.ExecuteNonQuery(@"
                 UPDATE TP_MST_USER 
                 SET
@@ -471,7 +518,8 @@ public class user : IHttpHandler, IReadOnlySessionState
                     ISGROUTINGWORKER = @ISGROUTINGWORKER@,
                     PLCID = @PLCID@,
                     UPDATEUSERID = @UPDATEUSERID@,
-                    UPDATETIME = sysdate
+                    UPDATETIME = sysdate,
+                    AD_USER_CODE = @AD_USER_CODE@
                 WHERE 
                     USERID = @USERID@
                 ",
@@ -494,7 +542,8 @@ public class user : IHttpHandler, IReadOnlySessionState
                 new CDAParameter("ISGROUTINGWORKER",form["ISGROUTINGWORKER"]),
                 new CDAParameter("PLCID",form["PLCID"]),
                 new CDAParameter("UPDATEUSERID",HttpContext.Current.Session["userId"]),
-                new CDAParameter("USERID",HttpContext.Current.Request["id"])
+                new CDAParameter("USERID",HttpContext.Current.Request["id"]),
+                 new CDAParameter("AD_USER_CODE",AD_USER_CODE)
             );
             return new JsonResult(JsonStatus.success).ToJson();
         }

wwwroot/mes/mst/user/user_add.html

@@ -57,6 +57,10 @@
                     <div class="w-field"><input class="easyui-textbox" id="USERCODE" name="USERCODE" data-options="required:true,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>
                 <div class="w-div">
+                    <div class="w-fieldname">AD域：</div>
+                    <div class="w-field"><input class="easyui-textbox" id="AD_USER_CODE" name="AD_USER_CODE" data-options="required:false,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                </div>
+                <div class="w-div">
                     <div class="w-fieldname">用户名：</div>
                     <div class="w-field"><input class="easyui-textbox" id="USERNAME" name="USERNAME" data-options="required:true,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>

wwwroot/mes/mst/user/user_edit.html

@@ -69,6 +69,10 @@
                     <div class="w-field"><input class="easyui-textbox" id="USERCODE" name="USERCODE" data-options="required:true,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>
                 <div class="w-div">
+                    <div class="w-fieldname">AD域：</div>
+                    <div class="w-field"><input class="easyui-textbox" id="AD_USER_CODE" name="AD_USER_CODE" data-options="required:false,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                </div>
+                <div class="w-div">
                     <div class="w-fieldname">用户名：</div>
                     <div class="w-field"><input class="easyui-textbox" id="USERNAME" name="USERNAME" data-options="required:true,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>

wwwroot/mes/mst/user/user_index.html

@@ -78,12 +78,13 @@
         <thead>
             <tr>
                 <th data-options="field:'SID',title:'SID',width:220,align:'left',checkbox:true,hidden:true">SID</th>
-                
+
                 <th data-options="field:'ORGANIZATIONFULLNAME',title:'部门',align:'left',sortable:true"></th>
                 <th data-options="field:'POSTNAME',title:'职务',align:'left',sortable:true"></th>
 
                 <!--<th data-options="field:'USERID',title:'用户ID',align:'left',sortable:true"></th>-->
                 <th data-options="field:'USERCODE',title:'用户编码',align:'left',sortable:true"></th>
+                <th data-options="field:'AD_USER_CODE',title:'AD域',align:'left',sortable:true"></th>
                 <th data-options="field:'USERNAME',title:'用户名',align:'left',sortable:true"></th>
 
                 <th data-options="field:'CANSMARTLOGIN',title:'PDA登录',align:'left',sortable:true"></th>