Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes

jiaosong

2023-08-14 7fdf35a2364c8482c5056a1c932e1501518f943b

 server/src/main/java/doumeemes/service/system/impl/SystemPermissionServiceImpl.java

@@ -116,8 +116,12 @@
        if(Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
            pageWrap.getModel().setType(Constants.USERTYPE.COM);
        }else{
            if(pageWrap.getModel().getType()!=null){
                //走查询
            }else{
            pageWrap.getModel().setType(Constants.USERTYPE.PLAT);
        }
        }
        PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
        return PageData.from(new PageInfo<>(systemPermissionMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause())));
    }