基础字段

k94314517

2023-09-15 e23b94bb04b0e5dbc4912add143cf1bf472c70f5

基础字段

 server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
package com.doumee.api.business;

import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BaseGoods;
import com.doumee.dao.business.model.dto.BaseGoodsCreateOrUpdateRequest;
import com.doumee.dao.business.model.dto.BaseGoodsDTO;
import com.doumee.service.business.BaseGoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/09/07 11:41
 */
@Api(tags = "素材库-商品信息表")
@RestController
@RequestMapping("/business/baseGoods")
public class BaseGoodsController extends BaseController {

    @Autowired
    private BaseGoodsService baseGoodsService;


    @ApiOperation("分页查询")
    @PostMapping("/page")
//    @RequiresPermissions("business:basegoods:query")
    public ApiResponse<PageData<BaseGoods>> findPage (@RequestBody PageWrap<BaseGoods> pageWrap) {
        return ApiResponse.success(baseGoodsService.findPage(pageWrap));
    }

}

 server/company/src/main/java/com/doumee/api/business/CategoryController.java

@@ -3,13 +3,22 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.BaseCateParam;
import com.doumee.dao.business.model.BaseCategory;
import com.doumee.dao.business.model.Category;
import com.doumee.service.business.BaseCateParamService;
import com.doumee.service.business.BaseCategoryService;
import com.doumee.service.business.CategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.java.Log;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -17,6 +26,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
 * @author æ±Ÿè¹„蹄
@@ -29,6 +39,12 @@

    @Autowired
    private CategoryService categoryService;

    @Autowired
    private BaseCategoryService baseCategoryService;

    @Autowired
    private BaseCateParamService baseCateParamService;

    @PreventRepeat
    @ApiOperation("新建")
@@ -88,6 +104,8 @@
    @PostMapping("/page")
    @RequiresPermissions("business:category:query")
    public ApiResponse<PageData<Category>> findPage (@RequestBody PageWrap<Category> pageWrap) {
        LoginUserInfo loginUserInfo = this.getLoginUser();
        pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
        return ApiResponse.success(categoryService.findPage(pageWrap));
    }

@@ -132,4 +150,33 @@
        return ApiResponse.success(categoryService.companyFindList(category));
    }

    @ApiOperation("平台分类列表")
    @PostMapping("/baseCategoryList")
    public ApiResponse<List<BaseCategory>> baseCategoryList () {
        BaseCategory baseCategory = new BaseCategory();
        baseCategory.setIsdeleted(Constants.ZERO);
        baseCategory.setStatus(Constants.ZERO);
        baseCategoryService.findList(baseCategory);
        List list = baseCategoryService.findList(baseCategory);
        return ApiResponse.success(list);
    }

    @ApiOperation("平台分类详情")
    @GetMapping("/baseCategoryDetail")
    public ApiResponse<BaseCategory> baseCategoryDetail (Integer baseCategoryId) {

        BaseCategory baseCategory = baseCategoryService.findById(baseCategoryId);
        if(Objects.isNull(baseCategory)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        BaseCateParam baseCateParam = new BaseCateParam();
        baseCateParam.setIsdeleted(Constants.ZERO);
        baseCateParam.setStatus(Constants.ZERO);
        baseCateParam.setCategoryId(baseCategoryId);
        baseCategory.setBaseCateParamList(
                baseCateParamService.findList(baseCateParam)
        );
        return ApiResponse.success(baseCategory);
    }

}

 server/company/src/main/java/com/doumee/api/common/PublicController.java

 server/company/src/main/java/com/doumee/api/system/SystemRoleController.java

@@ -5,8 +5,10 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateRoleMenuDTO;
import com.doumee.dao.system.dto.CreateRolePermissionDTO;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
@@ -104,8 +106,12 @@
    @GetMapping("/all")
    @RequiresPermissions("system:role:query")
    public ApiResponse<List<SystemRole>> findAll () {
        LoginUserInfo userInfo = this.getLoginUser();
        SystemRole systemRole = new SystemRole();
        systemRole.setDeleted(Boolean.FALSE);
        if(userInfo.getType().equals(Constants.ONE)){
            systemRole.setType(userInfo.getType());
        }
        return ApiResponse.success(systemRoleService.findList(systemRole));
    }
}

 server/company/src/main/java/com/doumee/api/system/SystemUserController.java

@@ -104,10 +104,9 @@
    @PostMapping("/page")
    @RequiresPermissions("system:user:query")
    public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
        pageWrap.getModel().setCompanyId(this.getLoginUser().getCompanyId());
        return ApiResponse.success(systemUserService.findPage(pageWrap));
    }



    @ApiOperation("分页查询系统用户")
    @PostMapping("/findAllList")
@@ -123,7 +122,6 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(systemUserService.findById(id));
    }


    @Trace(withRequestParameters = false)
    @PreventRepeat
@@ -155,7 +153,7 @@
    @RequiresPermissions("system:user:create")
    public ApiResponse companyUpdUser(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
        createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
        systemUserBiz.companyCreateUser(createCompanyUserDTO);
        systemUserBiz.companyUpdUser(createCompanyUserDTO);
        return ApiResponse.success(null);
    }

@@ -171,6 +169,16 @@
    }


    @PreventRepeat
    @ApiOperation("修改用户状态")
    @GetMapping("/updUserStatus")
//    @RequiresPermissions("system:user:create")
    public ApiResponse updUserStatus( @RequestParam Integer id,@RequestParam Integer status) {
        systemUserBiz.updUserStatus(id,status);
        return ApiResponse.success(null);
    }


    @Trace(withRequestParameters = false)
    @PreventRepeat
    @ApiOperation("修改密码")

 server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java

@@ -81,7 +81,7 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号或密码不正确！");
        }
        if(!Constants.equalsInteger(user.getType(),Constants.UserType.COMPANY.getKey()) && !Constants.equalsInteger(user.getType(),Constants.UserType.ZHUBO.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号或密码不正确！！");
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，非企业账户身份，无法登录该平台！！");
        }
        if(!Constants.equalsInteger(user.getStatus(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号信息已被禁用，如有疑问请联系系统管理员！");

 server/service/src/main/java/com/doumee/biz/system/SystemUserBiz.java

@@ -70,5 +70,6 @@

    void updPassword(CreateCompanyUserDTO updCreateCompanyUserDTO);

    void updUserStatus(Integer id,Integer status);

}

 server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java

@@ -236,8 +236,7 @@
        if(Objects.isNull(createCompanyUserDTO)
                ||StringUtils.isBlank(createCompanyUserDTO.getUserName())
                ||StringUtils.isBlank(createCompanyUserDTO.getRealName())
                ||StringUtils.isBlank(createCompanyUserDTO.getPassword())
                ||StringUtils.isBlank(createCompanyUserDTO.getMobile())){
                ||StringUtils.isBlank(createCompanyUserDTO.getPassword()) ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -259,7 +258,7 @@
        systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
        systemUser.setSalt(salt);
        Integer userId = systemUserService.create(systemUser);
        if(systemUser.getType().equals(Constants.UserType.COMPANY)){
        if(systemUser.getType().equals(Constants.UserType.COMPANY.getKey())){
            SystemUserRole newUserRole = new SystemUserRole();
            newUserRole.setUserId(userId);
            newUserRole.setRoleId(createCompanyUserDTO.getRoleId());
@@ -271,25 +270,18 @@
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void companyUpdUser(CreateCompanyUserDTO updCreateCompanyUserDTO) {
        if(Objects.isNull(updCreateCompanyUserDTO)
                ||Objects.isNull(updCreateCompanyUserDTO.getUserId())
                ||StringUtils.isBlank(updCreateCompanyUserDTO.getRealName())
                ||StringUtils.isBlank(updCreateCompanyUserDTO.getMobile())){
                ||Objects.isNull(updCreateCompanyUserDTO.getId())
                ||StringUtils.isBlank(updCreateCompanyUserDTO.getRealName())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        SystemUser systemUser  = systemUserService.findById(updCreateCompanyUserDTO.getUserId());
        SystemUser systemUser  = systemUserService.findById(updCreateCompanyUserDTO.getId());
        if(Objects.isNull(systemUser)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        systemUser.setRealname(updCreateCompanyUserDTO.getRealName());
        systemUser.setMobile(systemUser.getMobile());

        // ç”Ÿæˆå¯†ç ç›
//        String salt = RandomStringUtils.randomAlphabetic(6);
//        // ç”Ÿæˆå¯†ç 
//        systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
//        systemUser.setSalt(salt);
        systemUser.setMobile(updCreateCompanyUserDTO.getMobile());
        systemUserService.updateById(systemUser);
        if(systemUser.getType().equals(Constants.UserType.COMPANY)){
        if(systemUser.getType().equals(Constants.UserType.COMPANY.getKey())){
            // åˆ é™¤å…³è”角色
            SystemUserRole deleteDto = new SystemUserRole();
            deleteDto.setUserId(systemUser.getId());
@@ -304,13 +296,25 @@

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void updUserStatus(Integer id,Integer status) {

        SystemUser systemUser  = systemUserService.findById(id);
        if(Objects.isNull(systemUser)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        systemUser.setStatus(status);
        systemUserService.updateById(systemUser);
    }

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void updPassword(CreateCompanyUserDTO updCreateCompanyUserDTO) {
        if(Objects.isNull(updCreateCompanyUserDTO)
                ||Objects.isNull(updCreateCompanyUserDTO.getUserId())
                ||Objects.isNull(updCreateCompanyUserDTO.getId())
                ||StringUtils.isBlank(updCreateCompanyUserDTO.getPassword())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        SystemUser systemUser  = systemUserService.findById(updCreateCompanyUserDTO.getUserId());
        SystemUser systemUser  = systemUserService.findById(updCreateCompanyUserDTO.getId());
        if(Objects.isNull(systemUser)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -23,6 +23,7 @@
    public static final String ACCESS_KEY = "ACCESS_KEY";
    public static final String ENDPOINT = "ENDPOINT";
    public static final String RESOURCE_PATH = "RESOURCE_PATH";
    public static final String WEB_PARAM = "WEB_PARAM";


    public static final String SYSTEM ="SYSTEM";

 server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java

@@ -114,5 +114,9 @@
    @TableField(exist = false)
    private BigDecimal cateRatePrice;

    @ApiModelProperty(value = "全路径地址")
    @TableField(exist = false)
    private String fullImgUrl;


}

 server/service/src/main/java/com/doumee/dao/business/model/Goods.java

@@ -164,6 +164,18 @@
    @TableField(exist = false)
    private BigDecimal ePrice;

    @ApiModelProperty(value = "base指导价（元）", example = "1")
    @TableField(exist = false)
    private BigDecimal baseZdPrice;

    @ApiModelProperty(value = "base入手价格（元）", example = "1")
    @TableField(exist = false)
    private BigDecimal basePrice;

    @ApiModelProperty(value = "base加价系数", example = "1")
    @TableField(exist = false)
    private BigDecimal basePriceRate;



}

 server/service/src/main/java/com/doumee/dao/business/model/WebParam.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -27,7 +28,7 @@

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    private Byte deleted;
    private Integer deleted;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
@@ -63,11 +64,11 @@
    @ExcelColumn(name="背景图")
    private String bgImg;

    @ApiModelProperty(value = "顶部宣传图")
    @ApiModelProperty(value = "顶部宣传图(多个以,分割)")
    @ExcelColumn(name="顶部宣传图")
    private String topImg;

    @ApiModelProperty(value = "PK台图")
    @ApiModelProperty(value = "PK台图(多个以,分割)")
    @ExcelColumn(name="PK台图")
    private String pkImg;

@@ -75,4 +76,8 @@
    @ExcelColumn(name="内容范围尺寸")
    private String rangeSize;

    @ApiModelProperty(value = "前缀地址")
    @TableField(exist = false)
    private String resourcePath;

}

 server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java

@@ -16,7 +16,7 @@


    @ApiModelProperty(value = "用户主键", example = "1")
    private Integer userId;
    private Integer id;

    @ApiModelProperty(value = "账号", example = "1")
    private String userName;

 server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java

@@ -30,6 +30,10 @@
    @ApiModelProperty(value = "用户名")
    private String username;


    @ApiModelProperty(value = "用户名、手机号模糊查询")
    private String keyword;

    @ApiModelProperty(value = "姓名" , hidden = true)
    private String realname;

@@ -45,12 +49,15 @@
    @ApiModelProperty(value = "省编码")
    private Integer  provinceId;

    @ApiModelProperty(value = "状态：0 å¯ç”¨ 1 ç¦ç”¨")
    private Integer  status;

    @ApiModelProperty(value = "城市编码", example = "1" )
    private Integer cityId;

    @ApiModelProperty(value = "城市编码", hidden = true)
    private List<Integer> cityIds;
    @ApiModelProperty(value = "类型 0平台用户 1企业用户")
    @ApiModelProperty(value = "类型 0平台用户 1企业用户 2主播")
    private Integer type;



 server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java

@@ -209,7 +209,14 @@
    @Override
    public List<BaseCategory> findList(BaseCategory baseCategory) {
        QueryWrapper<BaseCategory> wrapper = new QueryWrapper<>(baseCategory);
        return baseCategoryMapper.selectList(wrapper);
        List<BaseCategory> list = baseCategoryMapper.selectList(wrapper);
        list.forEach(i->{
            i.setImgfullurl(
                systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
                            systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_IMG).getCode() + i.getImgurl()
            );
        });
        return list;
    }

    @Override

 server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java

@@ -346,7 +346,13 @@
                    .selectAs(Brand::getName,BaseGoods::getBrandName)
                    .selectAs(BaseCategory::getSortnum,BaseGoods::getCategoryName);
        queryWrapper.orderByDesc(Goods::getId);
        return PageData.from(baseGoodsJoinMapper.selectJoinPage(page,BaseGoods.class,queryWrapper));
        PageData<BaseGoods> pageData =PageData.from(baseGoodsJoinMapper.selectJoinPage(page,BaseGoods.class,queryWrapper));
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
        pageData.getRecords().forEach(i->{
            i.setFullImgUrl(prefixUrl + i.getImgurl());
        });
        return pageData;
    }

    @Override

 server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java

@@ -131,6 +131,7 @@
        category.setCreateDate(new Date());
        category.setCreator(user.getId());
        category.setIsdeleted(Constants.ZERO);
        category.setCompanyId(user.getCompanyId());
        //处理拼音问题
        category.setPinyin(PinYinUtil.getFullSpell(category.getName()));
        category.setShortPinyin(PinYinUtil.getFirstSpell(category.getName()));
@@ -393,12 +394,10 @@
    @Override
    public Category findById(Integer id) {
        Category category = categoryMapper.selectById(id);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
        category.setPrefixUrl(prefixUrl);
        category.setParamList(cateParamMapper.selectList(new QueryWrapper<CateParam>().eq("CATEGORY_ID",id).eq("ISDELETED",Constants.ZERO).orderByAsc(" SORTNUM ")));
        category.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",id).orderByAsc(" SORTNUM ")));
        category.setAttrSecondList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ONE).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",id).orderByAsc(" SORTNUM ")));
        category.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",id).eq("ISDELETED",Constants.ZERO).orderByAsc(" SORTNUM ")));
        return category;
    }
@@ -461,10 +460,13 @@
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(Category::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getCompanyId() != null) {
            queryWrapper.lambda().eq(Category::getCompanyId, pageWrap.getModel().getCompanyId());
        }
        queryWrapper.lambda().orderByAsc(Category::getSortnum);
        IPage<Category> categoryIPage = categoryMapper.selectPage(page, queryWrapper);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
        categoryIPage.getRecords().forEach(i->{
            i.setPrefixUrl(prefixUrl);
        });

 server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java

@@ -563,8 +563,8 @@
    @Override
    public Goods findById(Integer id) {
        Goods goods = goodsMapper.selectById(id);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
        goods.setPrefixUrl(prefixUrl);
        Brand brand = brandMapper.selectById(goods.getBrandId());
        if(!Objects.isNull(brand)){
@@ -607,8 +607,8 @@
                Goods::getPrice,goods.getSPrice(),goods.getEPrice());
        queryWrapper.orderByDesc(Goods::getId);
        List<Goods> goodsList = goodsJoinMapper.selectJoinList(Goods.class,queryWrapper);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
        goodsList.forEach(i->{
            i.setPrefixUrl(prefixUrl);
            i.setMultifileList(multifileMapper.selectList(new QueryWrapper<Multifile>().eq("OBJ_ID",i.getId()).orderByAsc(" SORTNUM ")));
@@ -625,11 +625,16 @@
        queryWrapper.selectAll(Goods.class);

        queryWrapper.selectAs(Category::getName, Goods::getCategoryName);
        queryWrapper.selectAs(BaseGoods::getZdPrice, Goods::getBaseZdPrice);
        queryWrapper.selectAs(BaseGoods::getPrice, Goods::getBasePrice);
        queryWrapper.selectAs(Brand::getName, Goods::getBrandName);
        queryWrapper.selectAs(Category::getAttrFirst, Goods::getAttrFirst);
        queryWrapper.selectAs(Category::getAttrSecond, Goods::getAttrSecond);
        queryWrapper.selectAs(BaseCategory::getPriceRate,Goods::getBasePriceRate);
        queryWrapper.leftJoin(Category.class, Category::getId, Goods::getCategoryId);
        queryWrapper.leftJoin(Brand.class, Brand::getId, Goods::getBrandId);
        queryWrapper.leftJoin(BaseGoods.class,BaseGoods::getId,Goods::getGoodsId);
        queryWrapper.leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getCategoryId);

        queryWrapper.eq(Goods::getIsdeleted, Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
@@ -653,10 +658,14 @@
        }
        queryWrapper.orderByDesc(Goods::getId);
        IPage<Goods> goodsIPage =  goodsJoinMapper.selectJoinPage(page, Goods.class, queryWrapper);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
        goodsIPage.getRecords().forEach(i->{
            i.setPrefixUrl(prefixUrl);
            if(i.getType().equals(Constants.ONE)){
                i.setBasePrice(i.getBasePrice().multiply(i.getBasePriceRate()));
            }

        });
        return PageData.from(goodsIPage);
    }

 server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java

@@ -1,8 +1,10 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WebParamMapper;
import com.doumee.dao.business.model.WebParam;
@@ -33,13 +35,21 @@
    @Autowired
    private WebParamMapper webParamMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Override
    public WebParam findOne() {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        QueryWrapper<WebParam> wrapper = new QueryWrapper<>();
        wrapper.eq("COMPANY_ID",user.getCompanyId());
        wrapper.last(" limit 1  ");
        return webParamMapper.selectOne(wrapper);
        WebParam webParam = webParamMapper.selectOne(wrapper);
        if(!Objects.isNull(webParam)){
            webParam.setResourcePath(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.OSS,Constants.WEB_PARAM).getCode());
        }
        return webParam;
    }


@@ -54,6 +64,7 @@
            webParam = new WebParam();
            BeanUtils.copyProperties(updateWebParamDTO,webParam);
            webParam.setCreateTime(new Date());
            webParam.setDeleted(Constants.ZERO);
            webParam.setCompanyId(user.getCompanyId());
            webParam.setCreateUser(user.getId());
            webParamMapper.insert(webParam);

 server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java

@@ -126,11 +126,11 @@
    public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
        // æ ¹éƒ¨é—¨æ¡ä»¶å¤„理（需查询根部门下所有部门的用户）
        if (pageWrap.getModel().getRootDeptId() != null) {
            pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
//            pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
        } else {
            List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
            List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
            pageWrap.getModel().setDepartmentIds(collect);
//            List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
//            List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
//            pageWrap.getModel().setDepartmentIds(collect);
        }
        // æ‰§è¡ŒæŸ¥è¯¢
        PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());

 server/service/src/main/resources/mappers/SystemUserMapper.xml

@@ -40,6 +40,18 @@
      <if test="dto.strictDeptId != null">
        AND sdu.DEPARTMENT_ID = #{dto.strictDeptId}
      </if>
      <if test="dto.type != null">
        AND usr.TYPE = #{dto.type}
      </if>
      <if test="dto.status != null">
        AND usr.STATUS = #{dto.status}
      </if>
      <if test="dto.keyword != null and dto.keyword != ''">
        AND ( usr.`USERNAME` LIKE CONCAT('%', #{dto.keyword}, '%')  or usr.`REALNAME` LIKE CONCAT('%', #{dto.keyword}, '%') )
      </if>
      <if test="dto.companyId != null">
        AND usr.COMPANY_ID = #{dto.companyId}
      </if>
      <if test="dto.departmentIds != null and dto.departmentIds.size > 0">
        AND sdu.DEPARTMENT_ID IN
        <foreach collection="dto.departmentIds" open="(" close=")" separator="," item="id">