Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect in...

jiangping

2023-09-21 b471c4d9a01438af23516b622eb4381c15a45073

Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev

 h5/utils/request.js

@@ -16,7 +16,7 @@
        // http://127.0.0.1/interface/    http://192.168.0.15:10024/   preselect_web_interface
        // https://dmtest.ahapp.net/preselect_web_interface/${url}   http://127.0.0.1:10022/  http://192.168.0.35:10024/
        uni.request({
            url: `http://192.168.0.35:10024/${url}`,
            url: `http://192.168.0.15:10024/${url}`,
            method,
            data,
            header: {

 server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java

@@ -35,7 +35,7 @@
    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
//    @RequiresPermissions("business:basecategory:create")
    @RequiresPermissions("business:basecategory:create")
    public ApiResponse create(@RequestBody BaseCategoryRequest baseCategory) {
        return ApiResponse.success(baseCategoryService.create(baseCategory));
    }
@@ -105,7 +105,7 @@

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
//    @RequiresPermissions("business:basecategory:query")
    @RequiresPermissions("business:basecategory:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(baseCategoryService.findById(id));
    }

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

@@ -53,6 +53,7 @@
    public static final String DEFAULT_PASSWORD = "DEFAULT_PASSWORD";
    public static final String BRAND_IMG = "BRAND_IMG";
    public static final String PLATFORM = "PLATFORM";
    public static final String ZHUBO_ROOM_URL = "ZHUBO_ROOM_URL";

    /**
     * 企业数据来源 0平台注册 1后台导入

 server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java

@@ -35,4 +35,8 @@
    @ApiModelProperty(value = "企业名称")
    private String companyName;


    @ApiModelProperty(value = "主播端地址")
    private String zhuboRoomUrl;

}

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

@@ -135,11 +135,14 @@
        // 执行查询
        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();

        for (SystemUserListVO user : userList) {
            // 查询用户角色列表
            user.setRoles(systemRoleService.findByUserId(user.getId()));
            // 查询用户岗位列表
//            user.setPositions(systemPositionService.findByUserId(user.getId()));
            user.setZhuboRoomUrl(zhuboRoomUrl);
        }
        return PageData.from(new PageInfo<>(userList));
    }