From 2b358187203d949deb4e535145ec7cfc5be81642 Mon Sep 17 00:00:00 2001 From: username <1532322479@qq.com> Date: Tue, 13 Aug 2024 22:49:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=90=86=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bs/df/controller/DfBizClueController.java | 4 +- .../bs/df/controller/DfBrokerController.java | 7 + .../DfProductArticleController.java | 8 + .../controller/DfProductInfoController.java | 195 +++- .../controller/DfProductMomentController.java | 8 + .../controller/DfProductPosterController.java | 7 + .../com/bs/df/domain/DfBrokerProduct.java | 12 + .../java/com/bs/df/domain/DfProductInfo.java | 7 + .../java/com/bs/df/mapper/DfBrokerMapper.java | 2 + .../com/bs/df/service/IDfBrokerService.java | 6 + .../df/service/impl/DfBrokerServiceImpl.java | 4 +- .../controller/system/SysLoginController.java | 60 +- .../system/SysRegisterController.java | 69 +- .../controller/system/SysUserController.java | 24 + .../web/controller/tool/TestController.java | 4 +- .../mapper/broker/DfBrokerMapper.xml | 14 + .../com/bs/common/constant/Constants.java | 2 +- .../bs/common/core/domain/entity/SysUser.java | 19 +- .../common/core/domain/model/LoginBody.java | 14 +- .../web/service/SysRegisterService.java | 14 +- .../com/bs/system/domain/SysUserOnline.java | 2 +- .../com/bs/system/mapper/SysUserMapper.java | 8 +- .../system/service/ISysUserOnlineService.java | 8 +- .../bs/system/service/ISysUserService.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 2 +- .../impl/SysUserOnlineServiceImpl.java | 8 +- .../service/impl/SysUserServiceImpl.java | 6 +- .../resources/mapper/system/SysUserMapper.xml | 11 +- bs-ui/src/api/product/info.js | 18 +- bs-ui/src/api/system/user.js | 22 + .../broker/broker/components/BrokerUser.vue | 101 +- .../broker/broker/components/DfBroker.vue | 5 +- .../product/components/BrokerProduct.vue | 182 +++- .../components/BrokerProductByUserId.vue | 867 ++++++++++++++++++ .../product/components/BrokerProductTwo.vue | 851 +++++++++++++++++ .../broker/product/components/DfBroker.vue | 5 +- .../product/components/DfBrokerUser.vue | 178 ++++ bs-ui/src/views/broker/product/index.vue | 54 +- .../broker/user/components/BrokerChange.vue | 14 +- .../broker/user/components/BrokerUser.vue | 27 +- bs-ui/src/views/monitor/logininfor/index.vue | 6 +- bs-ui/src/views/monitor/online/index.vue | 4 +- .../order/order/components/OrderUser.vue | 16 +- bs-ui/src/views/order/order/index.vue | 6 +- bs-ui/src/views/system/role/authUser.vue | 8 +- bs-ui/src/views/system/role/selectUser.vue | 6 +- bs-ui/src/views/system/user/index.vue | 48 +- bs-ui/src/views/system/user/profile/index.vue | 2 +- 48 files changed, 2725 insertions(+), 222 deletions(-) create mode 100644 bs-ui/src/views/broker/product/components/BrokerProductByUserId.vue create mode 100644 bs-ui/src/views/broker/product/components/BrokerProductTwo.vue create mode 100644 bs-ui/src/views/broker/product/components/DfBrokerUser.vue diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java b/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java index e286c4d..ab3dcb2 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java @@ -241,9 +241,9 @@ public class DfBizClueController extends BaseController { } /** - * 修改经济人ID + * 修改经纪人ID */ - @ApiOperation("经济人ID") + @ApiOperation("经纪人ID") @PostMapping("/changeUserId") public AjaxResult changeUserId(@RequestBody DfBizClue dfBizClue) { List list = dfBizClueService.list(new LambdaQueryWrapper().eq(DfBizClue::getShareUser, dfBizClue.getOldUserId())); diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java b/bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java index 0116be3..aa49d59 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java @@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse; import com.bs.common.core.domain.entity.SysUser; import com.bs.common.utils.SecurityUtils; import com.bs.df.domain.DfProductPoster; +import com.bs.df.mapper.DfBrokerMapper; import com.bs.df.utils.HtmlUtils; import com.bs.system.service.ISysUserService; import io.swagger.annotations.Api; @@ -50,6 +51,9 @@ public class DfBrokerController extends BaseController { private IDfBrokerService dfBrokerService; @Resource private ISysUserService sysUserService; + @Resource + private DfBrokerMapper dfBrokerMapper; + /** * 分页查询代理商经纪列表 */ @@ -221,6 +225,9 @@ public class DfBrokerController extends BaseController { @Log(title = "代理商经纪修改", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody DfBroker dfBroker) { + if (null == dfBroker.getParentId()) { + dfBrokerMapper.updateByNull(dfBroker); + } return toAjax(dfBrokerService.updateById(dfBroker)); } diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java index fa9c52c..1d849c2 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java @@ -15,6 +15,7 @@ import com.bs.df.domain.DfBizClue; import com.bs.df.domain.DfProductMoment; import com.bs.df.domain.DfProductPoster; import com.bs.df.utils.HtmlUtils; +import com.bs.system.mapper.SysUserMapper; import com.bs.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -56,6 +57,8 @@ public class DfProductArticleController extends BaseController { private ICmAttachService cmAttachService; @Resource private ISysUserService userService; + @Autowired + private SysUserMapper sysUserMapper; /** * 分页查询产品文章列表 */ @@ -63,6 +66,11 @@ public class DfProductArticleController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(DfProductArticle dfProductArticle) { startPage(); + SysUser sysUser = sysUserMapper.selectById(getUserId()); + String reviewStatus = sysUser.getReviewStatus(); + if ("1".equals(reviewStatus)) { + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); if (!admin) { diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java index 0495712..b9a2e20 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java @@ -75,10 +75,33 @@ public class DfProductInfoController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(DfProductInfo dfProductInfo) { startPage(); + SysUser sysUser = sysUserMapper.selectById(getUserId()); + String reviewStatus = sysUser.getReviewStatus(); + if ("1".equals(reviewStatus)) { + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); String brokerIds = dfProductInfo.getBrokerIds(); if ("1".equals(dfProductInfo.getSelectByBroker())) { - queryWrapper.inSql(DfProductInfo::getId,"select product_id from df_broker_product where broker_id in (" + brokerIds + ") and del_flag = '0' and staus = '1'"); + if (Validator.isNotEmpty(dfProductInfo.getUserId())) { + if ("1".equals(dfProductInfo.getIsSelectBroker())) { + String userId = dfProductInfo.getUserId(); + List productIdsByBrokerIdByUserId = dfBrokerService.getProductIdsByBrokerIdByUserId(Long.valueOf(userId)); + if (productIdsByBrokerIdByUserId == null || productIdsByBrokerIdByUserId.isEmpty()) { + productIdsByBrokerIdByUserId.add(0L); + } + queryWrapper.in(DfProductInfo::getId,productIdsByBrokerIdByUserId); + } else { + String userId = dfProductInfo.getUserId(); + List productIdsByBrokerIdByUserId = dfBrokerService.getProductIdsByBrokerIdByUserId(Long.valueOf(userId)); + if (productIdsByBrokerIdByUserId == null || productIdsByBrokerIdByUserId.isEmpty()) { + productIdsByBrokerIdByUserId.add(0L); + } + queryWrapper.inSql(DfProductInfo::getId,"select product_id from df_broker_product where user_id in (" + userId + ") and del_flag = '0' and staus = '1'"); + } + } else { + queryWrapper.inSql(DfProductInfo::getId,"select product_id from df_broker_product where broker_id in (" + brokerIds + ") and del_flag = '0' and staus = '1'"); + } } if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { List productIdsByBrokerId = dfBrokerService.getProductIdsByBrokerId(); @@ -117,10 +140,14 @@ public class DfProductInfoController extends BaseController { for (DfArea city : allCities) { cityMap.put(city.getAreaId(), city.getName()); } - Map brokerProductMap = new HashMap<>(); DfBroker byId = null; + SysUser userInfo = null; if ("1".equals(dfProductInfo.getSelectByBroker())) { - byId = dfBrokerService.getById(brokerIds); + if (Validator.isNotEmpty(dfProductInfo.getUserId())) { + userInfo = sysUserMapper.selectById(dfProductInfo.getUserId()); + } else { + byId = dfBrokerService.getById(brokerIds); + } } for (DfProductInfo productInfo : list) { productInfo.setInterestRate(productInfo.getInterestRateBegin() + "%-" + productInfo.getInterestRateEnd() + "%"); @@ -142,8 +169,17 @@ public class DfProductInfoController extends BaseController { productInfo.setBusinessCity(translatedCities.toString()); } if ("1".equals(dfProductInfo.getSelectByBroker())) { - productInfo.setBrokerName(byId.getBrokerName()); -// productInfo.setBrokerName(brokerProductMap.get(productInfo.getId())); + if (Validator.isNotEmpty(dfProductInfo.getUserId())) { + if ("1".equals(dfProductInfo.getIsSelectBroker())) { + Long deptId = userInfo.getDeptId(); + DfBroker byIdNew = dfBrokerService.getById(deptId); + productInfo.setBrokerName(byIdNew.getBrokerName()); + } else { + productInfo.setBrokerName(userInfo.getUserName()); + } + } else { + productInfo.setBrokerName(byId.getBrokerName()); + } } } return getDataTable(list); @@ -166,6 +202,27 @@ public class DfProductInfoController extends BaseController { return success(list); } + /** + * 根据userId查询产品信息列表 + */ + @ApiOperation("根据userId查询产品信息列表") + @GetMapping("/listByUserId") + public AjaxResult listByUserId(DfProductInfo dfProductInfo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + List productIdsByBrokerIdByUserId = dfBrokerService.getProductIdsByBrokerIdByUserId(Long.valueOf(dfProductInfo.getUserId())); + queryWrapper.notInSql(DfProductInfo::getId, + "select product_id from df_broker_product where del_flag = '0' and user_id = " + dfProductInfo.getUserId() + "") + .or() + .eq(DfProductInfo::getId,dfProductInfo.getId()); + condition(queryWrapper,dfProductInfo); + List list = dfProductInfoService.list(queryWrapper); + Set idsToRemove = productIdsByBrokerIdByUserId.stream().collect(Collectors.toSet()); + List filteredList = list.stream() + .filter(product -> !idsToRemove.contains(product.getId())) + .collect(Collectors.toList()); + return success(filteredList); + } + /** * 根据代理商经纪id查询产品信息列表 @@ -183,7 +240,8 @@ public class DfProductInfoController extends BaseController { List productIds = listBrokerProduct.stream() .map(DfBrokerProduct::getProductId) .collect(Collectors.toList()); - productIds.removeIf(id -> id.equals(dfProductInfo.getId())); + productIds.removeIf(id -> Objects.equals(id, dfProductInfo.getId())); +// productIds.removeIf(id -> id.equals(dfProductInfo.getId())); if (null != productIds && productIds.size() == 0) { productIds.add(0L); } @@ -363,24 +421,46 @@ public class DfProductInfoController extends BaseController { @PutMapping(value = "/getInfoByBroker") @Anonymous public AjaxResult getInfoByBroker(@RequestBody DfProductInfo dfProductInfo) { - DfProductInfo byId = dfProductInfoService.getById(dfProductInfo.getId()); - List list = dfBrokerProductService.list(new LambdaQueryWrapper() - .eq(DfBrokerProduct::getBrokerId, dfProductInfo.getBrokerId()) - .eq(DfBrokerProduct::getProductId, dfProductInfo.getId())); - if (list.size() > 0 && list != null) { - byId.setBrokerId(list.get(0).getBrokerId()); - } - String businessCity = byId.getBusinessCity(); - if (Validator.isEmpty(businessCity)) { + if(Validator.isNotEmpty(dfProductInfo.getBrokerId())) { + DfProductInfo byId = dfProductInfoService.getById(dfProductInfo.getId()); + List list = dfBrokerProductService.list(new LambdaQueryWrapper() + .eq(DfBrokerProduct::getBrokerId, dfProductInfo.getBrokerId()) + .eq(DfBrokerProduct::getProductId, dfProductInfo.getId())); + if (list.size() > 0 && list != null) { + byId.setBrokerId(list.get(0).getBrokerId()); + } + String businessCity = byId.getBusinessCity(); + if (Validator.isEmpty(businessCity)) { + return success(byId); + } + List businessCityList = Arrays.asList(businessCity.split(",")); + List douAreas = dfAreaService.listByIds(businessCityList); + String concatenatedNames = douAreas.stream() + .map(DfArea::getName) + .collect(Collectors.joining(",")); + byId.setBusinessCityByName(concatenatedNames); + return success(byId); + } else { + DfProductInfo byId = dfProductInfoService.getById(dfProductInfo.getId()); + List list = dfBrokerProductService.list(new LambdaQueryWrapper() + .eq(DfBrokerProduct::getUserId, dfProductInfo.getUserId()) + .eq(DfBrokerProduct::getProductId, dfProductInfo.getId())); + if (list.size() > 0 && list != null) { + byId.setUserId(list.get(0).getUserId()); + } + String businessCity = byId.getBusinessCity(); + if (Validator.isEmpty(businessCity)) { + return success(byId); + } + List businessCityList = Arrays.asList(businessCity.split(",")); + List douAreas = dfAreaService.listByIds(businessCityList); + String concatenatedNames = douAreas.stream() + .map(DfArea::getName) + .collect(Collectors.joining(",")); + byId.setBusinessCityByName(concatenatedNames); return success(byId); } - List businessCityList = Arrays.asList(businessCity.split(",")); - List douAreas = dfAreaService.listByIds(businessCityList); - String concatenatedNames = douAreas.stream() - .map(DfArea::getName) - .collect(Collectors.joining(",")); - byId.setBusinessCityByName(concatenatedNames); - return success(byId); + } /** @@ -496,6 +576,50 @@ public class DfProductInfoController extends BaseController { } } + /** + * 修改代理产品权限 + */ + @ApiOperation("修改代理产品权限") + @Log(title = "代理产品权限修改", businessType = BusinessType.UPDATE) + @PutMapping("/editByBrokers") + public AjaxResult editByBrokers(@RequestBody DfProductInfo dfProductInfo) { + for (Long id : dfProductInfo.getIds()) { + if (Validator.isNotEmpty(dfProductInfo.getUserId())) { + Long productInfoId = id; + String userId = dfProductInfo.getUserId(); + List list = dfBrokerProductService.list(new LambdaQueryWrapper() + .eq(DfBrokerProduct::getProductId, productInfoId) + .eq(DfBrokerProduct::getBrokerId, userId)); + if (list != null && list.size() > 0) { + DfBrokerProduct dfBrokerProduct = new DfBrokerProduct().setUserId(userId).setProductId(productInfoId).setId(list.get(0).getId()); + dfBrokerProduct.setStaus("1"); + dfBrokerProductService.updateById(dfBrokerProduct); + } else { + DfBrokerProduct dfBrokerProduct = new DfBrokerProduct().setUserId(userId).setProductId(productInfoId); + dfBrokerProduct.setStaus("1"); + dfBrokerProductService.save(dfBrokerProduct); + } + } else { + Long productInfoId = id; + Long brokerId = dfProductInfo.getBrokerId(); + List list = dfBrokerProductService.list(new LambdaQueryWrapper() + .eq(DfBrokerProduct::getProductId, productInfoId) + .eq(DfBrokerProduct::getBrokerId, brokerId)); + if (list != null && list.size() > 0) { + DfBrokerProduct dfBrokerProduct = new DfBrokerProduct().setBrokerId(brokerId).setProductId(productInfoId).setId(list.get(0).getId()); + dfBrokerProduct.setStaus("1"); + dfBrokerProductService.updateById(dfBrokerProduct); + } else { + DfBrokerProduct dfBrokerProduct = new DfBrokerProduct().setBrokerId(brokerId).setProductId(productInfoId); + dfBrokerProduct.setStaus("1"); + dfBrokerProductService.save(dfBrokerProduct); + } + } + } + System.out.println(dfProductInfo); + return toAjax(true); + } + /** * 移除代理产品权限 */ @@ -505,17 +629,22 @@ public class DfProductInfoController extends BaseController { public AjaxResult removeByBroker(@RequestBody DfProductInfo dfProductInfo) { Long[] ids = dfProductInfo.getIds(); Long brokerId = dfProductInfo.getBrokerId(); -// List list = dfBrokerService.list(new LambdaQueryWrapper().eq(DfBroker::getParentId, brokerId)); - List allSubordinates = dfBrokerService.findAllSubordinates(brokerId); -// List allSubordinates = findAllSubordinates(brokerId); - List brokerIds = allSubordinates.stream() - .map(DfBroker::getId) - .collect(Collectors.toList()); - brokerIds.add(brokerId); - boolean remove = dfBrokerProductService.remove(new LambdaQueryWrapper() - .in(DfBrokerProduct::getProductId, ids) - .in(DfBrokerProduct::getBrokerId, brokerIds)); - return toAjax(remove); + if (Validator.isNotEmpty(dfProductInfo.getUserId())) { + boolean remove = dfBrokerProductService.remove(new LambdaQueryWrapper() + .in(DfBrokerProduct::getProductId, ids) + .in(DfBrokerProduct::getUserId, dfProductInfo.getUserId())); + return toAjax(remove); + } else { + List allSubordinates = dfBrokerService.findAllSubordinates(brokerId); + List brokerIds = allSubordinates.stream() + .map(DfBroker::getId) + .collect(Collectors.toList()); + brokerIds.add(brokerId); + boolean remove = dfBrokerProductService.remove(new LambdaQueryWrapper() + .in(DfBrokerProduct::getProductId, ids) + .in(DfBrokerProduct::getBrokerId, brokerIds)); + return toAjax(remove); + } } diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java index fc101d6..afd18bf 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java @@ -13,6 +13,7 @@ import com.bs.common.utils.SecurityUtils; import com.bs.df.domain.DfProductArticle; import com.bs.df.domain.DfProductPoster; import com.bs.df.utils.HtmlUtils; +import com.bs.system.mapper.SysUserMapper; import com.bs.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -54,6 +55,8 @@ public class DfProductMomentController extends BaseController { private ICmAttachService cmAttachService; @Resource private ISysUserService userService; + @Autowired + private SysUserMapper sysUserMapper; /** * 分页查询产品朋友圈列表 */ @@ -61,6 +64,11 @@ public class DfProductMomentController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(DfProductMoment dfProductMoment) { startPage(); + SysUser sysUser = sysUserMapper.selectById(getUserId()); + String reviewStatus = sysUser.getReviewStatus(); + if ("1".equals(reviewStatus)) { + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); condition(queryWrapper,dfProductMoment); boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java index b8fbd94..14ec284 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java @@ -62,6 +62,8 @@ public class DfProductPosterController extends BaseController { private IDfBrokerService dfBrokerService;; @Resource private ISysUserService userService; + @Autowired + private SysUserMapper sysUserMapper; /** * 分页查询产品海报列表 */ @@ -69,6 +71,11 @@ public class DfProductPosterController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(DfProductPoster dfProductPoster) { startPage(); + SysUser sysUser = sysUserMapper.selectById(getUserId()); + String reviewStatus = sysUser.getReviewStatus(); + if ("1".equals(reviewStatus)) { + return null; + } MPJLambdaWrapper queryWrapper = new MPJLambdaWrapper(); queryWrapper.selectAll(DfProductPoster.class) .select(DfProductInfo::getProductName) diff --git a/bs-admin/src/main/java/com/bs/df/domain/DfBrokerProduct.java b/bs-admin/src/main/java/com/bs/df/domain/DfBrokerProduct.java index a852aad..3a4cd70 100644 --- a/bs-admin/src/main/java/com/bs/df/domain/DfBrokerProduct.java +++ b/bs-admin/src/main/java/com/bs/df/domain/DfBrokerProduct.java @@ -41,6 +41,18 @@ public class DfBrokerProduct extends BaseEntity{ @ApiModelProperty(value = "产品id") private Long productId; + /** 用户id */ + + @Excel(name = "用户id") + @ApiModelProperty(value = "用户id") + private String userId; + + /** 代理商类型 */ + +// @Excel(name = "代理商类型") +// @ApiModelProperty(value = "代理商类型") +// private String type; + /** 备注 */ @Excel(name = "备注") diff --git a/bs-admin/src/main/java/com/bs/df/domain/DfProductInfo.java b/bs-admin/src/main/java/com/bs/df/domain/DfProductInfo.java index 570c40f..0b4e96a 100644 --- a/bs-admin/src/main/java/com/bs/df/domain/DfProductInfo.java +++ b/bs-admin/src/main/java/com/bs/df/domain/DfProductInfo.java @@ -180,6 +180,10 @@ public class DfProductInfo extends BaseEntity{ @TableField(exist = false) private Long brokerId; + + @TableField(exist = false) + private String userId; + @TableField(exist = false) private Long[] ids; @@ -188,4 +192,7 @@ public class DfProductInfo extends BaseEntity{ @TableField(exist = false) private String isBroker; + @TableField(exist = false) + private String isSelectBroker; + } diff --git a/bs-admin/src/main/java/com/bs/df/mapper/DfBrokerMapper.java b/bs-admin/src/main/java/com/bs/df/mapper/DfBrokerMapper.java index c000fd9..d4b1697 100644 --- a/bs-admin/src/main/java/com/bs/df/mapper/DfBrokerMapper.java +++ b/bs-admin/src/main/java/com/bs/df/mapper/DfBrokerMapper.java @@ -2,6 +2,7 @@ package com.bs.df.mapper; import com.bs.common.mybatis.mapper.BaseMapperX; import com.bs.df.domain.DfBroker; +import org.apache.ibatis.annotations.Param; /** * 代理商经纪Mapper接口 @@ -11,4 +12,5 @@ import com.bs.df.domain.DfBroker; */ public interface DfBrokerMapper extends BaseMapperX { + void updateByNull(@Param("dfBroker") DfBroker dfBroker); } diff --git a/bs-admin/src/main/java/com/bs/df/service/IDfBrokerService.java b/bs-admin/src/main/java/com/bs/df/service/IDfBrokerService.java index 192f3b0..94d4316 100644 --- a/bs-admin/src/main/java/com/bs/df/service/IDfBrokerService.java +++ b/bs-admin/src/main/java/com/bs/df/service/IDfBrokerService.java @@ -19,6 +19,12 @@ public interface IDfBrokerService extends MPJBaseService{ */ public List filterByUser(); + /** + * 通过用户id获取相对应的代理商权限 + * @return 代理商权限 + */ + public List filterByUserId(Long userId); + /** * 通过代理商id获取相对应的子代理 * @return 代理商权限 diff --git a/bs-admin/src/main/java/com/bs/df/service/impl/DfBrokerServiceImpl.java b/bs-admin/src/main/java/com/bs/df/service/impl/DfBrokerServiceImpl.java index 3f69801..78ab1cd 100644 --- a/bs-admin/src/main/java/com/bs/df/service/impl/DfBrokerServiceImpl.java +++ b/bs-admin/src/main/java/com/bs/df/service/impl/DfBrokerServiceImpl.java @@ -72,7 +72,9 @@ public class DfBrokerServiceImpl extends MPJBaseServiceImpl longs = filterByUser(); List list = dfBrokerProductService.list(new LambdaQueryWrapper() .in(DfBrokerProduct::getBrokerId, longs) - .eq(DfBrokerProduct::getStaus, "1")); + .eq(DfBrokerProduct::getStaus, "1") + .or() + .in(DfBrokerProduct::getUserId, SecurityUtils.getUserId())); return list.stream().map(DfBrokerProduct::getProductId).collect(Collectors.toList()); } diff --git a/bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java b/bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java index 13bab57..3d1fb3f 100644 --- a/bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java +++ b/bs-admin/src/main/java/com/bs/web/controller/system/SysLoginController.java @@ -206,16 +206,16 @@ public class SysLoginController @Log(title = "用户获取公众号id", businessType = BusinessType.GRANT) public AjaxResult bindingWx(@RequestBody LoginBody loginBody) { // 生成令牌 - if (StringUtils.isEmpty(loginBody.getWxCode())) { - return AjaxResult.error("请传入微信Code"); - } +// if (StringUtils.isEmpty(loginBody.getWxCode())) { +// return AjaxResult.error("请传入微信Code"); +// } if (StringUtils.isEmpty(loginBody.getGzhCode())) { return AjaxResult.error("请传ghzCode"); } JSONObject xcxJo = weiXinUtil.getXCXOpenId(loginBody.getWxCode()); - if (StringUtils.isEmpty(xcxJo.getString("openId"))) { - return AjaxResult.error("微信code错误"); - } +// if (StringUtils.isEmpty(xcxJo.getString("openId"))) { +// return AjaxResult.error("微信code错误"); +// } JSONObject gzhJo = null; gzhJo = weiXinUtil.getGZHOpenId(loginBody.getGzhCode()); if (StringUtils.isEmpty(gzhJo.getString("openId"))) { @@ -223,20 +223,27 @@ public class SysLoginController } //判断微信是否被其他用户绑定 SysUser tempUser = sysUserMapper.selectOne(new LambdaQueryWrapper().eq(SysUser::getGzhOpenId, gzhJo.getString("openId"))); - if (tempUser!=null) { return AjaxResult.error("此微信已被绑定"); } SysUser updateUser = new SysUser(); updateUser.setXcxOpenId(""); - sysUserMapper.update(updateUser,new LambdaUpdateWrapper().eq(SysUser::getXcxOpenId, xcxJo.getString("openId"))); + if (StringUtils.isEmpty(loginBody.getWxCode())) { + sysUserMapper.update(updateUser,new LambdaUpdateWrapper().eq(SysUser::getXcxOpenId, gzhJo.getString("openId"))); + } else { + sysUserMapper.update(updateUser,new LambdaUpdateWrapper().eq(SysUser::getXcxOpenId, xcxJo.getString("openId"))); + } SysUser sysUser = sysUserMapper.selectById(SecurityUtils.getUserId()); if(StringUtils.isNotEmpty(sysUser.getGzhOpenId())&&!sysUser.getGzhOpenId().equals(gzhJo.getString("openId"))){ return AjaxResult.error("您的账号已经绑定过其他微信,请先解绑"); } sysUser.setXcxOpenId(xcxJo.getString("openId")); sysUser.setGzhOpenId( gzhJo.getString("openId")); - sysUser.setUnionId(xcxJo.getString("unionid")); + if (StringUtils.isEmpty(loginBody.getWxCode())) { + sysUser.setUnionId(gzhJo.getString("unionid")); + } else { + sysUser.setUnionId(xcxJo.getString("unionid")); + } sysUserMapper.updateById(sysUser); LoginUser loginUser = SecurityUtils.getLoginUser(); loginUser.getUser().setXcxOpenId(sysUser.getXcxOpenId()); @@ -260,18 +267,28 @@ public class SysLoginController AjaxResult ajax = AjaxResult.success(); // 生成令牌 if (StringUtils.isEmpty(loginBody.getWxCode())) { - return AjaxResult.error("请传入微信Code"); +// return AjaxResult.error("请传入微信Code"); } SysUser sysUser; - JSONObject xcxJo = weiXinUtil.getXCXOpenId(loginBody.getWxCode()); + JSONObject xcxJo = new JSONObject(); + if (!StringUtils.isEmpty(loginBody.getWxCode())) { + xcxJo = weiXinUtil.getXCXOpenId(loginBody.getWxCode()); + } +// JSONObject xcxJo = weiXinUtil.getXCXOpenId(loginBody.getWxCode()); if (StringUtils.isEmpty(xcxJo.getString("openId"))) { - return AjaxResult.error("code错误"); +// return AjaxResult.error("code错误"); } JSONObject gzhJo = new JSONObject(); if(StringUtils.isNotEmpty(loginBody.getGzhCode())){ gzhJo = weiXinUtil.getGZHOpenId(loginBody.getGzhCode()); } - List lsUser = sysUserMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getXcxOpenId, xcxJo.getString("openId"))); + List lsUser = null; + if (!StringUtils.isEmpty(loginBody.getWxCode())) { + lsUser = sysUserMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getXcxOpenId, xcxJo.getString("openId"))); + } else { + lsUser = sysUserMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getGzhOpenId, gzhJo.getString("openId"))); + } +// List lsUser = sysUserMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getXcxOpenId, xcxJo.getString("openId"))); if (lsUser != null && lsUser.size() > 0) { sysUser = lsUser.get(0); } else { @@ -280,13 +297,22 @@ public class SysLoginController .put("gzhOpenId", gzhJo.getString("openId")!=null?gzhJo.getString("openId"):"").put("unionId", xcxJo.getString("unionid")); } if(StringUtils.isEmpty(sysUser.getXcxOpenId())){ - sysUser.setXcxOpenId(xcxJo.getString("openId")); + if (StringUtils.isEmpty(loginBody.getWxCode())) { + sysUser.setXcxOpenId(gzhJo.getString("openId")); + } else { + sysUser.setXcxOpenId(xcxJo.getString("openId")); + } } if(StringUtils.isEmpty(sysUser.getGzhOpenId())){ sysUser.setGzhOpenId(gzhJo.getString("openId")!=null?gzhJo.getString("openId"):""); } if(StringUtils.isEmpty(sysUser.getUnionId())){ - sysUser.setUnionId(xcxJo.getString("unionid")); + if (StringUtils.isEmpty(loginBody.getWxCode())) { + sysUser.setUnionId(gzhJo.getString("unionid")); + } else { + sysUser.setUnionId(xcxJo.getString("unionid")); + } +// sysUser.setUnionId(xcxJo.getString("unionid")); } String token = setLoginUser(sysUser); ajax.put(Constants.TOKEN, token); @@ -299,8 +325,8 @@ public class SysLoginController //登入成功，查询租户配置 if (null != user.getTenantId()) { // SysTenant tenant = tenantService.getById(user.getTenantId()); - SysTenant tenant = tenantService.getById("5"); - TenantConfig config = tenantConfigService.getOne(new LambdaQueryWrapper().eq(TenantConfig::getId, tenant.getId())); + SysTenant tenant = new SysTenant(); + TenantConfig config = tenantConfigService.getOne(new LambdaQueryWrapper().eq(TenantConfig::getId, "5")); if (config == null) { config = new TenantConfig(); config.setIsUserAstrict("0"); diff --git a/bs-admin/src/main/java/com/bs/web/controller/system/SysRegisterController.java b/bs-admin/src/main/java/com/bs/web/controller/system/SysRegisterController.java index bd524c6..e7fd48e 100644 --- a/bs-admin/src/main/java/com/bs/web/controller/system/SysRegisterController.java +++ b/bs-admin/src/main/java/com/bs/web/controller/system/SysRegisterController.java @@ -1,5 +1,20 @@ package com.bs.web.controller.system; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bs.common.constant.Constants; +import com.bs.common.core.domain.entity.SysRole; +import com.bs.common.core.domain.entity.SysTenant; +import com.bs.common.core.domain.entity.SysUser; +import com.bs.common.core.domain.model.LoginUser; +import com.bs.framework.web.service.SysLoginService; +import com.bs.framework.web.service.SysPermissionService; +import com.bs.framework.web.service.TokenService; +import com.bs.system.domain.SysUserRole; +import com.bs.system.mapper.SysRoleMapper; +import com.bs.system.mapper.SysUserMapper; +import com.bs.system.mapper.SysUserRoleMapper; +import com.bs.system.service.ISysUserService; +import io.swagger.util.Json; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -11,6 +26,10 @@ import com.bs.common.utils.StringUtils; import com.bs.framework.web.service.SysRegisterService; import com.bs.system.service.ISysConfigService; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 注册验证 * @@ -25,14 +44,54 @@ public class SysRegisterController extends BaseController @Autowired private ISysConfigService configService; + @Autowired + private ISysUserService userService; + + @Autowired + private SysUserMapper userMapper; + + @Autowired + private SysLoginService loginService; + + @Autowired + private TokenService tokenService; + + @Autowired + private SysUserRoleMapper sysUserRoleMapper; + @Autowired + private SysRoleMapper sysRoleMapper; + @Autowired + private SysPermissionService permissionService; @PostMapping("/register") public AjaxResult register(@RequestBody RegisterBody user) { - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) - { - return error("当前系统没有开启注册功能！"); - } +// if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) +// { +// return error("当前系统没有开启注册功能！"); +// } String msg = registerService.register(user); - return StringUtils.isEmpty(msg) ? success() : error(msg); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysUser::getUserName,user.getUsername()); + List sysUsers = userMapper.selectList(wrapper); + SysUser sysUser = sysUsers.get(0); + userService.insertUserAuth(sysUser.getUserId(), new Long[]{2L}); + LoginUser loginUser = createLoginUser(sysUser, null); + String token = tokenService.createToken(loginUser); + AjaxResult ajax = AjaxResult.success(); + ajax.put(Constants.TOKEN, token); + return ajax; + } + + public LoginUser createLoginUser(SysUser user, SysTenant tenant) { + //查询用户下的权限 + LambdaQueryWrapper userRoleWrapper = new LambdaQueryWrapper<>(); + userRoleWrapper.select(SysUserRole::getRoleId); + userRoleWrapper.eq(SysUserRole::getUserId,user.getUserId()); + List roleIds = sysUserRoleMapper.selectObjs(userRoleWrapper); + //查询用户下的权限 + LambdaQueryWrapper roleWrapper = new LambdaQueryWrapper<>(); + roleWrapper.in(SysRole::getRoleId,roleIds); + user.setRoles(sysRoleMapper.selectList(roleWrapper)); + return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); } } diff --git a/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java b/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java index e3cdfda..31dc770 100644 --- a/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java +++ b/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java @@ -85,6 +85,12 @@ public class SysUserController extends BaseController { return getDataTable(list); } + @GetMapping("/listUserAll") + public AjaxResult listUserAll(SysUser user) { + List list = userService.selectUserList(user); + return success(list); + } + @GetMapping("/listByType") public TableDataInfo listByType(SysUser user) { if (!"1".equals(user.getSelectAll())) { @@ -355,6 +361,18 @@ public class SysUserController extends BaseController { return toAjax(userService.updateUserStatus(user)); } + /** + * 审核状态修改 + */ + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeUserReviewStatus") + public AjaxResult changeUserReviewStatus(@RequestBody SysUser user) { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + user.setUpdateBy(getUsername()); + return toAjax(userService.updateUserStatus(user)); + } + /** * 根据用户编号获取授权角色 */ @@ -441,6 +459,12 @@ public class SysUserController extends BaseController { queryWrapper.like(SysUser::getPhonenumber,sysUser.getPhonenumber()); } + //真实姓名 + if(Validator.isNotEmpty(sysUser.getRealName())){ + queryWrapper.like(SysUser::getRealName,sysUser.getRealName()); + } + + //用户性别（0男 1女 2未知） if(Validator.isNotEmpty(sysUser.getSex())){ queryWrapper.eq(SysUser::getSex,sysUser.getSex()); diff --git a/bs-admin/src/main/java/com/bs/web/controller/tool/TestController.java b/bs-admin/src/main/java/com/bs/web/controller/tool/TestController.java index e2ef0df..d296858 100644 --- a/bs-admin/src/main/java/com/bs/web/controller/tool/TestController.java +++ b/bs-admin/src/main/java/com/bs/web/controller/tool/TestController.java @@ -64,7 +64,7 @@ public class TestController extends BaseController @ApiOperation("新增用户") @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class), - @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class), + @ApiImplicitParam(name = "username", value = "登陆账号", dataType = "String", dataTypeClass = String.class), @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class), @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class) }) @@ -119,7 +119,7 @@ class UserEntity @ApiModelProperty("用户ID") private Integer userId; - @ApiModelProperty("用户名称") + @ApiModelProperty("登陆账号") private String username; @ApiModelProperty("用户密码") diff --git a/bs-admin/src/main/resources/mapper/broker/DfBrokerMapper.xml b/bs-admin/src/main/resources/mapper/broker/DfBrokerMapper.xml index eca6381..be3550d 100644 --- a/bs-admin/src/main/resources/mapper/broker/DfBrokerMapper.xml +++ b/bs-admin/src/main/resources/mapper/broker/DfBrokerMapper.xml @@ -4,4 +4,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + UPDATE df_broker + + + parent_id = #{dfBroker.parentId}, + + + parent_id = NULL, + + + + WHERE id = #{dfBroker.id} + + diff --git a/bs-common/src/main/java/com/bs/common/constant/Constants.java b/bs-common/src/main/java/com/bs/common/constant/Constants.java index 138634b..c25dc3c 100644 --- a/bs-common/src/main/java/com/bs/common/constant/Constants.java +++ b/bs-common/src/main/java/com/bs/common/constant/Constants.java @@ -100,7 +100,7 @@ public class Constants public static final String JWT_USERID = "userid"; /** - * 用户名称 + * 登陆账号 */ public static final String JWT_USERNAME = Claims.SUBJECT; diff --git a/bs-common/src/main/java/com/bs/common/core/domain/entity/SysUser.java b/bs-common/src/main/java/com/bs/common/core/domain/entity/SysUser.java index 79494b2..b488fae 100644 --- a/bs-common/src/main/java/com/bs/common/core/domain/entity/SysUser.java +++ b/bs-common/src/main/java/com/bs/common/core/domain/entity/SysUser.java @@ -43,10 +43,10 @@ public class SysUser extends BaseEntity @TableField(exist = false) private String deptName; - /** 用户账号 */ - @Excel(name = "登录名称") - @Xss(message = "用户账号不能包含脚本字符") - @NotBlank(message = "用户账号不能为空") + /** 登陆账号 */ + @Excel(name = "登陆账号") + @Xss(message = "登陆账号不能包含脚本字符") + @NotBlank(message = "登陆账号不能为空") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") private String userName; @@ -89,10 +89,12 @@ public class SysUser extends BaseEntity @ApiModelProperty(value = "公司") private String company; - + @Excel(name = "真实姓名") + @ApiModelProperty(value = "真实姓名") + private String realName; /** 用户昵称 */ - @Excel(name = "用户名称") + @Excel(name = "用户昵称") @Xss(message = "用户昵称不能包含脚本字符") @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") private String nickName; @@ -199,6 +201,11 @@ public class SysUser extends BaseEntity @TableField(exist = false) private String selectAll; + //1为查询所有 + @TableField(exist = false) + private String isBroker; + + /** * 微信小程序openId */ diff --git a/bs-common/src/main/java/com/bs/common/core/domain/model/LoginBody.java b/bs-common/src/main/java/com/bs/common/core/domain/model/LoginBody.java index f1ef7ea..e6bc403 100644 --- a/bs-common/src/main/java/com/bs/common/core/domain/model/LoginBody.java +++ b/bs-common/src/main/java/com/bs/common/core/domain/model/LoginBody.java @@ -1,8 +1,11 @@ package com.bs.common.core.domain.model; import com.baomidou.mybatisplus.annotation.TableField; +import com.bs.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.Size; + /** * 用户登录对象 * @@ -15,6 +18,12 @@ public class LoginBody */ private String username; + /** 手机号码 */ + private String phonenumber; + + /** 推荐注册人 */ + private String shareUser; + /** * 用户密码 */ @@ -70,7 +79,6 @@ public class LoginBody private String fromType; - private String shareUser; private String businessLinks; @@ -235,5 +243,9 @@ public class LoginBody this.shareUser = shareUser; } + public String getPhonenumber() { return phonenumber; } + + public void setPhonenumber(String phonenumber) { this.phonenumber = phonenumber; } + } diff --git a/bs-framework/src/main/java/com/bs/framework/web/service/SysRegisterService.java b/bs-framework/src/main/java/com/bs/framework/web/service/SysRegisterService.java index 1d4aa3b..befc9e5 100644 --- a/bs-framework/src/main/java/com/bs/framework/web/service/SysRegisterService.java +++ b/bs-framework/src/main/java/com/bs/framework/web/service/SysRegisterService.java @@ -43,14 +43,13 @@ public class SysRegisterService String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); SysUser sysUser = new SysUser(); sysUser.setUserName(username); - + sysUser.setReviewStatus("1"); // 验证码开关 boolean captchaEnabled = configService.selectCaptchaEnabled(); if (captchaEnabled) { validateCaptcha(username, registerBody.getCode(), registerBody.getUuid()); } - if (StringUtils.isEmpty(username)) { msg = "用户名不能为空"; @@ -75,6 +74,17 @@ public class SysRegisterService } else { + if (!StringUtils.isEmpty(registerBody.getShareUser())) { + SysUser sysUserShare = userService.selectUserById(Long.valueOf(registerBody.getShareUser())); + Long deptId = sysUserShare.getDeptId(); + sysUser.setDeptId(deptId); + } else { + sysUser.setDeptId(116L); + + } + sysUser.setPhonenumber(registerBody.getPhonenumber()); + sysUser.setUserType("jj"); + sysUser.setTenantId(0L); sysUser.setNickName(username); sysUser.setPassword(SecurityUtils.encryptPassword(password)); boolean regFlag = userService.registerUser(sysUser); diff --git a/bs-system/src/main/java/com/bs/system/domain/SysUserOnline.java b/bs-system/src/main/java/com/bs/system/domain/SysUserOnline.java index ce6d993..64f00ed 100644 --- a/bs-system/src/main/java/com/bs/system/domain/SysUserOnline.java +++ b/bs-system/src/main/java/com/bs/system/domain/SysUserOnline.java @@ -13,7 +13,7 @@ public class SysUserOnline /** 部门名称 */ private String deptName; - /** 用户名称 */ + /** 登陆账号 */ private String userName; /** 登录IP地址 */ diff --git a/bs-system/src/main/java/com/bs/system/mapper/SysUserMapper.java b/bs-system/src/main/java/com/bs/system/mapper/SysUserMapper.java index 6bd81d1..c92d4cd 100644 --- a/bs-system/src/main/java/com/bs/system/mapper/SysUserMapper.java +++ b/bs-system/src/main/java/com/bs/system/mapper/SysUserMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.bs.common.core.domain.entity.SysUser; import com.bs.common.mybatis.mapper.BaseMapperX; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -42,9 +43,9 @@ public interface SysUserMapper extends BaseMapperX { /** - * 校验用户名称是否唯一 + * 校验登陆账号是否唯一 * - * @param userName 用户名称 + * @param userName 登陆账号 * @return 结果 */ public SysUser checkUserNameUnique(String userName); @@ -67,4 +68,7 @@ public interface SysUserMapper extends BaseMapperX { * @return 结果 */ public SysUser checkEmailUnique(String email); + + Boolean insertNew(@Param("user")SysUser user); + } diff --git a/bs-system/src/main/java/com/bs/system/service/ISysUserOnlineService.java b/bs-system/src/main/java/com/bs/system/service/ISysUserOnlineService.java index c6cbdf3..d07cce4 100644 --- a/bs-system/src/main/java/com/bs/system/service/ISysUserOnlineService.java +++ b/bs-system/src/main/java/com/bs/system/service/ISysUserOnlineService.java @@ -20,19 +20,19 @@ public interface ISysUserOnlineService public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); /** - * 通过用户名称查询信息 + * 通过登陆账号查询信息 * - * @param userName 用户名称 + * @param userName 登陆账号 * @param user 用户信息 * @return 在线用户信息 */ public SysUserOnline selectOnlineByUserName(String userName, LoginUser user); /** - * 通过登录地址/用户名称查询信息 + * 通过登录地址/登陆账号查询信息 * * @param ipaddr 登录地址 - * @param userName 用户名称 + * @param userName 登陆账号 * @param user 用户信息 * @return 在线用户信息 */ diff --git a/bs-system/src/main/java/com/bs/system/service/ISysUserService.java b/bs-system/src/main/java/com/bs/system/service/ISysUserService.java index 7cc298c..8889269 100644 --- a/bs-system/src/main/java/com/bs/system/service/ISysUserService.java +++ b/bs-system/src/main/java/com/bs/system/service/ISysUserService.java @@ -69,7 +69,7 @@ public interface ISysUserService extends MPJBaseService public String selectUserPostGroup(String userName); /** - * 校验用户名称是否唯一 + * 校验登陆账号是否唯一 * * @param user 用户信息 * @return 结果 diff --git a/bs-system/src/main/java/com/bs/system/service/impl/SysMenuServiceImpl.java b/bs-system/src/main/java/com/bs/system/service/impl/SysMenuServiceImpl.java index 78a5709..25ee5f6 100644 --- a/bs-system/src/main/java/com/bs/system/service/impl/SysMenuServiceImpl.java +++ b/bs-system/src/main/java/com/bs/system/service/impl/SysMenuServiceImpl.java @@ -128,7 +128,7 @@ public class SysMenuServiceImpl implements ISysMenuService { /** * 根据用户ID查询菜单 * - * @param userId 用户名称 + * @param userId 登陆账号 * @return 菜单列表 */ @Override diff --git a/bs-system/src/main/java/com/bs/system/service/impl/SysUserOnlineServiceImpl.java b/bs-system/src/main/java/com/bs/system/service/impl/SysUserOnlineServiceImpl.java index 94dd061..309957e 100644 --- a/bs-system/src/main/java/com/bs/system/service/impl/SysUserOnlineServiceImpl.java +++ b/bs-system/src/main/java/com/bs/system/service/impl/SysUserOnlineServiceImpl.java @@ -32,9 +32,9 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService } /** - * 通过用户名称查询信息 + * 通过登陆账号查询信息 * - * @param userName 用户名称 + * @param userName 登陆账号 * @param user 用户信息 * @return 在线用户信息 */ @@ -49,10 +49,10 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService } /** - * 通过登录地址/用户名称查询信息 + * 通过登录地址/登陆账号查询信息 * * @param ipaddr 登录地址 - * @param userName 用户名称 + * @param userName 登陆账号 * @param user 用户信息 * @return 在线用户信息 */ diff --git a/bs-system/src/main/java/com/bs/system/service/impl/SysUserServiceImpl.java b/bs-system/src/main/java/com/bs/system/service/impl/SysUserServiceImpl.java index 83e7377..6e2cfbf 100644 --- a/bs-system/src/main/java/com/bs/system/service/impl/SysUserServiceImpl.java +++ b/bs-system/src/main/java/com/bs/system/service/impl/SysUserServiceImpl.java @@ -81,6 +81,7 @@ public class SysUserServiceImpl extends MPJBaseServiceImpl 0; + user.setUserType("jj"); + return userMapper.insertNew(user); } /** diff --git a/bs-system/src/main/resources/mapper/system/SysUserMapper.xml b/bs-system/src/main/resources/mapper/system/SysUserMapper.xml index 4178a23..0c659d0 100644 --- a/bs-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bs-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -178,8 +178,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) + + INSERT INTO sys_user (user_id, dept_id, user_name, nick_name, email, phonenumber, sex, avatar, password, status, review_status, + tenant_id,user_type ) + VALUES (#{user.userId}, #{user.deptId}, #{user.userName}, #{user.nickName}, #{user.email}, + #{user.phonenumber}, #{user.sex}, #{user.avatar}, #{user.password}, #{user.status}, #{user.reviewStatus}, + #{user.tenantId}, #{user.userType}) - + + + + update sys_user dept_id = #{deptId}, diff --git a/bs-ui/src/api/product/info.js b/bs-ui/src/api/product/info.js index 201b3e9..fa66a64 100644 --- a/bs-ui/src/api/product/info.js +++ b/bs-ui/src/api/product/info.js @@ -18,6 +18,15 @@ export function listInfo(query) { }) } +// 根据userId查询产品信息列表 +export function listByUserId(query) { + return request({ + url: '/product/info/listByUserId', + method: 'get', + params: query + }) +} + // 根据代理商经纪id查询产品信息列表 export function listByBroker(query) { return request({ @@ -79,7 +88,14 @@ export function editByBroker(data) { }) } - +// 修改产品信息 +export function editByBrokers(data) { + return request({ + url: '/product/info/editByBrokers', + method: 'put', + data: data + }) +} // 删除产品信息 export function delInfo(id) { diff --git a/bs-ui/src/api/system/user.js b/bs-ui/src/api/system/user.js index 81cff83..6ff1ec8 100644 --- a/bs-ui/src/api/system/user.js +++ b/bs-ui/src/api/system/user.js @@ -10,6 +10,15 @@ export function listUser(query) { }) } +// 查询用户列表 +export function listUserAll(query) { + return request({ + url: '/system/user/listUserAll', + method: 'get', + params: query + }) +} + export function listUserByType(query) { return request({ url: '/system/user/listByType', @@ -87,6 +96,19 @@ export function changeUserStatus(userId, status) { }) } +// 用户审核状态修改 +export function changeUserReviewStatus(userId, reviewStatus) { + const data = { + userId, + reviewStatus + } + return request({ + url: '/system/user/changeUserReviewStatus', + method: 'put', + data: data + }) +} + // 查询用户个人信息 export function getUserProfile() { return request({ diff --git a/bs-ui/src/views/broker/broker/components/BrokerUser.vue b/bs-ui/src/views/broker/broker/components/BrokerUser.vue index aab793d..7d5c855 100644 --- a/bs-ui/src/views/broker/broker/components/BrokerUser.vue +++ b/bs-ui/src/views/broker/broker/components/BrokerUser.vue @@ -1,14 +1,22 @@ + + +