系统账户管理列表用户角色显示优化

yzh

2022-06-23 203edd6bbdf883e897a0075037a4ef68cd519ac9

系统账户管理列表用户角色显示优化

 web/.vs/Web/v16/.suo

Binary files differ

 web/Common/DataConverter.cs

@@ -252,7 +252,7 @@
        //检查数组格式字符串中是否包含某元素
        public static bool checkStrForArrayStr(object str, string arrayStr )
        {
            return stringToArray(arrayStr).Contains(str);
            return stringToArray(arrayStr).Contains(str.ToString() );
        }

        //检查数组中是否包含某元素

 web/Dao/GwClientDao.cs

@@ -543,7 +543,7 @@
        /**
         * 函数描述： 根据客户ID获取分配的个性产品
         * clientId: 客户户ID
         * userType: 用户类型：1-管理员;2-业务员--全员;3-业务主管;4-业务总监;5-客服人员;6-财务人员;99-其他
         * userType: 用户类型，多个时以“,”分隔：1-管理员;2-业务员--全员;3-客户经理;4-客服人员;5-财务人员
         * return: SQL字符串
         * */


 web/Dao/UserDao.cs

@@ -34,12 +34,25 @@
        {
            List<SysUser> list = new List<SysUser>();
            recordCount = 0;
            using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count from Sys_User", OracleHelper.Connection))
            StringBuilder stringBuilder = new StringBuilder();
            stringBuilder.Append(" FROM ( ");
            stringBuilder.Append(" SELECT su.*, t.ROLE_NAMES  FROM sys_user su ");
            stringBuilder.Append(" LEFT JOIN ( ");
            stringBuilder.Append(" select su.user_id, wm_concat( sdd.dict_label) ROLE_NAMES from sys_user su  ");
            stringBuilder.Append(" LEFT JOIN (select DICT_VALUE, DICT_LABEL from sys_dict_data where dict_type='USER_ROLE' ) sdd ");
            stringBuilder.Append(" on INSTR (user_type, sdd.dict_value) > 0 ");
            stringBuilder.Append(" GROUP BY su.user_id ");
            stringBuilder.Append(" ) t on t.user_id = su.user_id ");
            stringBuilder.Append(" ) ");

            //using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count from Sys_User", OracleHelper.Connection))
            using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count " + stringBuilder.ToString(), OracleHelper.Connection))
            {
                while (((DbDataReader)reader).Read())
                    recordCount = this.ReadCount(reader);
            }
            using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * from Sys_User").ToString(), OracleHelper.Connection))
            //using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * from Sys_User").ToString(), OracleHelper.Connection))
            using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * " + stringBuilder.ToString() ).ToString(), OracleHelper.Connection))
            {
                while (((DbDataReader)reader).Read())
                {
@@ -197,6 +210,7 @@
            e.Salt = oracleReaderWrapper.GetString("SALT", "");
            e.UserName = oracleReaderWrapper.GetString("USER_NAME", "");
            e.UserType = oracleReaderWrapper.GetString("USER_TYPE", "");
            e.RoleNames = oracleReaderWrapper.GetString("ROLE_NAMES", "");            
            e.ExpireTime = oracleReaderWrapper.GetDateTime("EXPIRE_TIME");
            e.CreateTime = oracleReaderWrapper.GetDateTime("CREATE_TIME");
            e.Remark = oracleReaderWrapper.GetString("REMARK", "");

 web/Lib/Common.dll

Binary files differ

 web/Lib/Common.pdb

Binary files differ

 web/Lib/Dao.dll

Binary files differ

 web/Lib/Dao.pdb

Binary files differ

 web/Lib/Model.dll

Binary files differ

 web/Lib/Model.pdb

Binary files differ

 web/Model/Model/SysUser.cs

@@ -42,9 +42,11 @@

        public int Status { get; set; }

        //public int UserType { get; set; }   //用户类型:1-管理员;2-业务员--全员;3-业务主管;4-业务总监;5-客服人员;6-财务人员;99-其他
        //public int UserType { get; set; }   //用户类型，多个时以“,”分隔：1-管理员;2-业务员--全员;3-客户经理;4-客服人员;5-财务人员
        public string UserType { get; set; }    //关联字典数据表的类型为：USER_ROLE。多个角色时以半角“,”分隔。

        public string RoleNames { get; set; }   //角色名称：多个角色时以半角“,”分隔。

        public Dictionary<string, SysUserMenu> MenuIDList { get; set; }

        public bool HasRight(string code)

 web/web/Bin/Common.dll

Binary files differ

 web/web/Bin/Common.pdb

Binary files differ

 web/web/Bin/Dao.dll

Binary files differ

 web/web/Bin/Dao.pdb

Binary files differ

 web/web/Bin/Model.dll

Binary files differ

 web/web/Bin/Model.pdb

Binary files differ

 web/web/GwClient.aspx

@@ -4,52 +4,6 @@
    <%--<link href="css/plugins/bootstrap-fileinput/fileinput.min.css" rel="stylesheet"/>
    <script src="js/plugins/bootstrap-fileinput/fileinput.min.js" type="text/javascript"></script>--%>
    <script type="text/javascript">
        $(function () {

            $("#pager").Pager({
                pageSize: 20,
                onChange: function (pageIndex, pageSize) {
                    loadPageList();
                }
            });

            function loadPageList() {
                var ClientID = $("#ClientID").val(); 
                var Company = $("#Company").val();
                var ClientName = $("#ClientName").val();
                var Telephone = $("#Telephone").val();
                //var Agent = $("#Agent").val();
                var Agent = "";
                var Salesman = $("#Salesman").val();
                var SupportStaff = $("#SupportStaff").val();
                var ProductId = $("#ProductId").val();
                var IsEnable = <%=IsEnable%>;
                $.ajax({
                    url: "GwClient.ashx",
                    type: "POST",
                    data: { action: "loadGwClientPageList", ClientID: ClientID, Company: Company, ClientName: ClientName, Telephone: Telephone, Agent: Agent, Salesman: Salesman, SupportStaff: SupportStaff, ProductId: ProductId, IsEnable: IsEnable , pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") },
                    success: function (result) {
                        if (result.OK) {
                            $("#gwclientTable tbody").html(result.Message.Table);
                            $("#pager").Pager("setTotalCount", result.Message.TotalCount);
                        } else {
                            mytek.alert(result.Message, result.OK);
                        }
                    }
                });
            }

            function randomString(len) {
                len = len || 32;
                var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';    /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
                var maxPos = $chars.length;
                var pwd = '';
                for (i = 0; i < len; i++) {
                    pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
                }
                return pwd;
            }

            $(document).ready(function () {
                $("textarea").numberedtextarea();

@@ -79,6 +33,18 @@
                    $("#clientDialog #financialStaff").val("");
                    $("#clientDialog #remark").val("");
                    $("#clientDialog input[name=permissionData]").iCheck("uncheck");

                $("#clientDialog input[name=isEnableWhite][value='" + 0 + "']").iCheck("check");
                $("#clientDialog input[name=isEnableBlack][value='" + 0 + "']").iCheck("check");
                $("#clientDialog input[name=isRemoteLoginNotice][value='" + 0 + "']").iCheck("check");
                $("#clientDialog input[name=isMobileCaptcha][value='" + 0 + "']").iCheck("check");
                $("#clientDialog input[name=isHideMobile][value='" + 0 + "']").iCheck("check");
                $("#clientDialog input[name=isDisplayStatus][value='" + 0 + "']").iCheck("check");
                $("#clientDialog input[name=isLoginIpRestrict][value='" + 0 + "']").iCheck("check");

                $("#clientDialog #isLoginIpAllowGather").val("");
                $("#clientDialog input[name=isLoginCityRestrict][value='" + 0 + "']").iCheck("check");
                $("#clientDialog #isLoginCityAllowGather").val("");

                    $("#clientDialog").modal("show");

@@ -258,7 +224,6 @@
                //修改分配个性产品：修改确认
                $(document).on("click", ".action-updateProduct", function () {
                    var productIdArray = [];

                    mytek.confirm("是否需要修改客户分配个性产品？", "确认分配个性产品，请谨慎操作！", function (b) {
                        if (b) {
                            $("#updateProductDialog #_ProductId").each(function () {
@@ -282,6 +247,8 @@
                                    }
                                }
                            });

                        //swal.close();
                        }
                    });
                });
@@ -354,6 +321,51 @@
                **/

            })


        $("#pager").Pager({
            pageSize: 20,
            onChange: function (pageIndex, pageSize) {
                loadPageList();
            }
        });

        function loadPageList() {
            var ClientID = $("#ClientID").val(); 
            var Company = $("#Company").val();
            var ClientName = $("#ClientName").val();
            var Telephone = $("#Telephone").val();
            //var Agent = $("#Agent").val();
            var Agent = "";
            var Salesman = $("#Salesman").val();
            var SupportStaff = $("#SupportStaff").val();
            var ProductId = $("#ProductId").val();
            var IsEnable = <%=IsEnable%>;
            $.ajax({
                url: "GwClient.ashx",
                type: "POST",
                data: { action: "loadGwClientPageList", ClientID: ClientID, Company: Company, ClientName: ClientName, Telephone: Telephone, Agent: Agent, Salesman: Salesman, SupportStaff: SupportStaff, ProductId: ProductId, IsEnable: IsEnable , pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") },
                success: function (result) {
                    if (result.OK) {
                        $("#gwclientTable tbody").html(result.Message.Table);
                        $("#pager").Pager("setTotalCount", result.Message.TotalCount);
                    } else {
                        mytek.alert(result.Message, result.OK);
                    }
                }
            });
        }

        function randomString(len) {
            len = len || 32;
            var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';    /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
            var maxPos = $chars.length;
            var pwd = '';
            for (i = 0; i < len; i++) {
                pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
            }
            return pwd;
        }

            //全选
            $("#checkAll").click(function () {
@@ -506,11 +518,7 @@

            });


        });
    </script>
        

</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="title" runat="Server">客户信息</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="content" runat="Server">
@@ -800,7 +808,7 @@
                                是否启用白名单
                            </label>
                            <div class="col-sm-4">
                                <input type="radio" class="icheck-me" name="isEnableWhite" value="0" /><label>禁用</label>
                                <input type="radio" class="icheck-me" name="isEnableWhite" value="0" checked="checked" /><label>禁用</label>
                                <input type="radio" class="icheck-me" name="isEnableWhite" value="1" /><label>启用</label>
                            </div>
                        </div>
@@ -1061,12 +1069,17 @@
                    <div class="modal-footer">
                        <button class="btn-default btn" data-dismiss="modal" aria-hidden="true">
                            取消</button>&nbsp;&nbsp;
                        <a class="btn btn-primary action-updateProduct">
                            保存</a>
                        <button class="btn btn-primary action-updateProduct" data-dismiss="modal" aria-hidden="true">
                            保存</button>
                    </div>
                </div>
            </div>
        </div>

    <!-- footBar -->
    <div id="mask" class="mask">
        <span></span>
        <img src="img/spinning-circles.svg" alt="载入中..." />
    </div>
</asp:Content>


 web/web/GwClient.aspx.cs

@@ -274,7 +274,7 @@
    //检查数组格式字符串中是否包含某元素
    public static bool checkStrForArrayStr(object str, string arrayStr)
    {
        return stringToArray(arrayStr).Contains(str);
        return stringToArray(arrayStr).Contains(str.ToString());
    }

    //字符串转数组

 web/web/GwOrderAudit.aspx

@@ -189,8 +189,7 @@
                        mytek.alert(result.Message, result.OK, function () {
                            loadPageList();
                        });
                    },
                        "json");
                    }, "json");
                }
            });
        });

 web/web/GwOrderCreate.aspx

@@ -186,7 +186,7 @@

                        mytek.alert(r.Message, r.OK, function () {
                            if (r.OK) {
                                window.location = "GwSp.aspx";
                                window.location = "<%=backUrl%>";
                            } else {
                                mytek.alert(r.Message, false);
                            }

 web/web/SysUser.aspx

@@ -20,6 +20,8 @@
                            html.push("<tr>");
                            html.push("<td>" + this.Account + "</td>");
                            html.push("<td>" + this.UserName + "</td>");
                            html.push("<td>" + this.RoleNames + "</td>");
                            /**
                            if (this.UserType == 1) {
                                html.push("<td>" + "管理员" + "</td>");
                            }
@@ -43,7 +45,7 @@
                            }
                            else {
                                html.push("<td>" + "" + "</td>");
                            }
                            }**/

                            html.push("<td>" + this.Mobile + "</td>");
                            html.push("<td>" + formatFlagIcon(this.MobileFlag) + "</td>");