jiangping
2023-09-21 04c7bc483f55deccb2aeae621a416080fb64fe89
Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
已修改3个文件
11 ■■■■■ 文件已修改
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/zhubo/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -1093,7 +1093,9 @@
                .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getEPrice()), "  t.PRICE <=  "+pageWrap.getModel().getEPrice()+" ");
        queryWrapper.orderByDesc(Goods::getId);
        IPage<Goods> goodsIPage =  goodsJoinMapper.selectJoinPage(page, Goods.class, queryWrapper);
        this.dealGoodsMsg(goodsIPage.getRecords());
        if(!Objects.isNull(goodsIPage.getRecords())&&goodsIPage.getRecords().size()>Constants.ZERO){
            this.dealGoodsMsg(goodsIPage.getRecords());
        }
        return PageData.from(goodsIPage);
    }
@@ -1103,8 +1105,9 @@
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
        String prefixUrlCategory = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
        List<Integer> integerList = goodsList.stream().map(Goods::getId).collect(Collectors.toList());
        List<Multifile> mFileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
                .in("OBJ_ID",integerList).eq("TYPE",Constants.ZERO));
        List<GoodsParam> goodsParamList = goodsParamMapper.selectList(new QueryWrapper<GoodsParam>()
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -135,7 +135,7 @@
        // 执行查询
        PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
        List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
        String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.ZHUBO_ROOM_URL).getCode();
        String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ZHUBO_ROOM_URL).getCode();
        for (SystemUserListVO user : userList) {
            // 查询用户角色列表
server/zhubo/pom.xml
@@ -26,7 +26,7 @@
    </dependencies>
    <build>
        <finalName>company</finalName>
        <finalName>zhubo</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>