Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

8 天以前 b7d9f2e23cbda587d814c7d07c1664c053c83dcb

 DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs

@@ -26,7 +26,7 @@
        {
            if (string.IsNullOrEmpty(_userGuid))
            {
                MsgHelper.Warning("请先选择你要操作的用户！");
                MsgHelper.ShowError("请先选择你要操作的用户！");
                return;
            }

@@ -52,15 +52,20 @@
                strJson = UtilityHelper.HttpPost("", "Role/SetUserRole",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0)
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg);
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnData.outMsg);
                Close();
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        /// <summary>
        /// 读取角色列表
        /// </summary>
        private void GetCheckList()
        {
            var _obj = new
@@ -74,6 +79,8 @@
                    JsonConvert.SerializeObject(_obj));
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;
                if (dt == null)
                    return;
                ckList.DataSource = dt;
                ckList.ValueMember = "guid";
                ckList.DisplayMember = "roleName";
@@ -88,7 +95,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -162,7 +169,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
    }