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

Mr.Shi

2023-08-14 5f5f07db32be63e6112ddff7722c1ada10472da5

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

@@ -116,7 +116,11 @@
        if(Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
            pageWrap.getModel().setType(Constants.USERTYPE.COM);
        }else{
            pageWrap.getModel().setType(Constants.USERTYPE.PLAT);
            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())));