20200721 代码提交

xiaoyong931011

2020-07-21 a6b3c3c8e76755c1daba2b7276b398346bf00269

20200721  代码提交

 src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml

@@ -38,8 +38,8 @@
                <if test="record.account!=null and record.account!=''">

                    and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})

                </if>

                 <if test="record.isTest!=null and record.isTest!=''">

                    and m.account_type= #{record.isTest}

                 <if test="record.accountType!=null and record.accountType!=''">

                    and m.account_type= #{record.accountType}

                </if>

            </if>

        </where>


 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html

@@ -15,7 +15,7 @@
                                    <div class="layui-inline">

                                        <label class="layui-form-label layui-form-label-sm">账号类型</label>

                                        <div class="layui-input-inline">

                                            <select name="isTest">

                                            <select name="accountType">

                                                <option value=""></option>

                                                <option value="1">正常账号</option>

                                                 <option value="2">测试账号</option>

@@ -138,7 +138,7 @@
        function getQueryParams() {

            return {

                account: $searchForm.find('input[name="account"]').val().trim(),

                isTest: $searchForm.find("select[name='isTest']").val()

                accountType: $searchForm.find("select[name='accountType']").val()

            };

        }