Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-15 5b83b50d38c757b38dcc87a40a17d34cc2948e10

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java

@@ -504,7 +504,7 @@
        if (UserExt.getUser().getObjectType()==3){
            if (StringUtils.hasLength(sites)){
                useScope = 4;
                sites="";
                storeIds="";
                pointsMerchandise.setUseScope(4);
            }else{
                useScope = 3;

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java

@@ -117,7 +117,6 @@
                    .filter(role -> role.containsKey("version") && role.get("version").equals(UserExt.getUser().getId()))
                    .collect(Collectors.toList());
            return super.warpObject(new RoleWarpper(filteredRoles));

        }
        return super.warpObject(new RoleWarpper(roles));
    }

 cloud-server-management/src/main/resources/mapper/RoleMapper.xml

@@ -26,8 +26,8 @@
        <if test="objectType == 3">
            and rr.objType =3  and rr.objId =#{objectId}
        </if>
        <if test="objectType == 1">
            and rr.objType =1
        <if test="objectType == 2">
            and rr.objType =2
        </if>
    </select>


 cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html

@@ -221,7 +221,12 @@
                <div class="form-group">
                    <div class="form-group">
                        <div class="col-sm-12">
                            @if(userType!=3){
                            <label class="col-sm-3 control-label">*指定场地: </label>
                            @}
                            @if(userType==3){
                            <label class="col-sm-3 control-label">指定场地: </label>
                            @}
                            <button onclick="siteList1()"
                                    style="height: 22px;width: 82px;background-color: #4a8ff1;color: white;z-index: 15;position:relative;border: none;margin-top: 1%">
                                选择场地

 cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js

@@ -18,7 +18,7 @@
        {title: '商品名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
        {title: '兑换地点', field: 'useScope', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row, index) {
                return {1: "全国", 2: "指定城市", 3: "指定门店"}[value]
                return {1: "全国", 2: "指定城市", 3: "指定门店",4:"指定场地"}[value]
            }
        },
        {title: '用户人群', field: 'userPopulation', visible: true, align: 'center', valign: 'middle',

 cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js

@@ -164,11 +164,6 @@
 */
TPointProducts.openEditPage = function () {
    if (this.check()) {
       let size =  TPointProducts.seItem.size
        if(size>0){
            Feng.info("没有操作权限");
            return;
        }
        var index = layer.open({
            type: 2,
            title:'编辑',
@@ -187,11 +182,7 @@
 */
TPointProducts.onShelf = function () {
    if (this.check()){
        let size =  TPointProducts.seItem.size
        if(size>0){
            Feng.info("没有操作权限");
            return;
        }

        var selected = $('#' + this.id).bootstrapTable('getSelections');
        const data1 = {
            ids:[],
@@ -225,11 +216,11 @@
 */
TPointProducts.offShelf = function () {
    if (this.check()){
        let size =  TPointProducts.seItem.size
        if(size>0){
            Feng.info("没有操作权限");
            return;
        }
        // let size =  TPointProducts.seItem.size
        // if(size>0){
        //     Feng.info("没有操作权限");
        //     return;
        // }
        var selected = $('#' + this.id).bootstrapTable('getSelections');
        const data1 = {
            ids:[],