jyy
2021-08-02 432136e8ecb50f72474c4d0a38b78420d4a14a95
修改错误字段名称
3 files modified
40 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/common/bean/SysRole.java 10 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml 24 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html 6 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysRole.java
@@ -61,7 +61,7 @@
    /**
     * 所有客户权限
     */
    private String coustomer;
    private String customer;
    /**
     * 功能集合
@@ -81,12 +81,12 @@
    @Extend
    private String menuKeys;
    public String getCoustomer() {
        return coustomer;
    public String getCustomer() {
        return customer;
    }
    public void setCoustomer(String coustomer) {
        this.coustomer = coustomer;
    public void setCustomer(String customer) {
        this.customer = customer;
    }
    public Integer getIsDefault() {
zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml
@@ -12,7 +12,7 @@
        <result property="companyId" column="company_id" />
        <result property="plates" column="plates" />
        <result property="shopAble" column="shop_able" />
        <result property="coustomer" column="coustomer" />
        <result property="customer" column="customer" />
    </resultMap>
@@ -32,7 +32,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        customer,
        shop_able
        )
        VALUES (
@@ -46,7 +46,7 @@
        #{companyId},
        #{plates},
        #{isDefault},
        #{coustomer},
        #{customer},
        #{shopAble}
        )
    </insert>
@@ -66,7 +66,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        customer,
        shop_able
        )
        VALUES
@@ -82,7 +82,7 @@
            #{item.companyId},
            #{item.plates},
            #{item.isDefault},
            #{item.coustomer},
            #{item.customer},
            #{item.shopAble}
            )
        </foreach>
@@ -115,8 +115,8 @@
            <if test="_parameter.containsKey('shopAble')">
                shop_able = #{shopAble},
            </if>
            <if test="_parameter.containsKey('coustomer')">
                coustomer = #{coustomer},
            <if test="_parameter.containsKey('customer')">
                customer = #{customer},
            </if>
        </set>
        WHERE role_id=#{roleId}
@@ -150,8 +150,8 @@
            <if test="(shopAble!=null and shopAble!='') or (shopAble!='' and shopAble==0)">
                shop_able = #{shopAble},
            </if>
            <if test="(coustomer!=null and coustomer!='') or (coustomer!='' and coustomer==0)">
                coustomer = #{coustomer},
            <if test="(customer!=null and customer!='') or (customer!='' and customer==0)">
                customer = #{customer},
            </if>
        </set>
        WHERE role_id=#{roleId}
@@ -217,7 +217,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        customer,
        shop_able
        from sys_role
        <where>
@@ -303,7 +303,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        customer,
        shop_able
        from sys_role
        where role_id=#{roleId}
@@ -336,7 +336,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        customer,
        shop_able
        from sys_role
        <where>
zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html
@@ -62,9 +62,9 @@
        <div class="form-group">
            <label class="col-sm-2 control-label">可查询所有门店客户</label>
            <div class="col-sm-4">
                <select class="form-control" name="coustomer">
                    <option th:selected="${obj?.coustomer == '是'}" >是</option>
                    <option th:selected="${obj?.coustomer == '否'}" >否</option>
                <select class="form-control" name="customer">
                    <option th:selected="${obj?.customer == '是'}" >是</option>
                    <option th:selected="${obj?.customer == '否'}" >否</option>
                </select>
            </div>
            <label class="col-sm-2 control-label">是否允许门店分配本角色</label>