fix 商务本月详情

netflix-dao/src/main/java/com/cyksj/model/views/DistributeBusinessView.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@SearchBean(tables = "user_distribute_business_rate ur left join user_distribute_business_order_don_record ubr on ubr.business_id = ur.business_id" +
+@SearchBean(tables = "(select distinct business_id from user_distribute_business_rate) ur left join user_distribute_business_order_don_record ubr on ubr.business_id = ur.business_id" +
 		" left join cms_user cu on cu.id = ur.business_id",
 		groupBy = "ur.business_id,cu.nickname,date_format(ubr.order_created_time,'%Y-%m')")
 public class DistributeBusinessView {

netflix-service/src/main/java/com/cyksj/service/distribute/impl/DistributeServiceImpl.java

@@ -77,7 +77,7 @@ public class DistributeServiceImpl implements DistributeService {
 		userDistribute.setRemark(userDistributeReq.getRemark());
 		if (userDistribute.getBusinessId() == null) {
 			userDistribute.setBusinessId(0l);
-		}
+		} else userDistribute.setBusinessId(userDistributeReq.getBusinessId());
 		userDistributeMapper.updateById(userDistribute);
 		for (UserPlatDistributeRate rate : userDistributeReq.getRates()) {
 			if (rate.getRate() < 0 || rate.getRate() > 100) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -168,7 +168,6 @@ public class DistributeController {
 	 * 获取平台分销比例
 	 */
 	@GetMapping("/get/plat")
-	@SaCheckPermission("distribute:platRateView")
 	public Result<List<GoodsDon>> getGoodsDistributeRate() {
 		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonMapper.selectList(Wrappers.lambdaQuery(GoodsDon.class).in(GoodsDon::getType, Constant.dsGoodsIds).eq(GoodsDon::getDeleted, true).orderByAsc(GoodsDon::getType).orderByAsc(GoodsDon::getId).select(GoodsDon::getId, GoodsDon::getType, GoodsDon::getTitle, GoodsDon::getRate, GoodsDon::getSecondRate)));
 	}
@@ -359,7 +358,6 @@ public class DistributeController {
 	 * 绑定固定分销者的商务人员详情
 	 */
 	@GetMapping("/get/business/list")
-	@SaCheckPermission("distribute:businessView")
 	public Result<SearchResult<DistributeBusinessView>> getDistributeBusinessView() {
 		long adminId = StpUtil.getLoginIdAsLong();
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());

netflix-web/src/main/resources/application.yml

@@ -1 +1 @@
-spring:
  profiles:
    active:
      - ${activeProfile}
    
+spring:
  profiles:
    active:
      - ${activeProfile}