fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideOrderQueryBo.java

@@ -93,4 +93,7 @@ public class TopDivideOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("类型 1机构分成 2业务员提成  3佣金结算")
 	private Integer divideType;
+
+	@ApiModelProperty("角色ID")
+	private Long roleId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopDivideOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.financial.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
@@ -22,6 +23,7 @@ import com.github.pagehelper.Page;
 
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -109,7 +111,13 @@ public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper,
     @Override
     public List<TopDivideOrderVo> getMonthOrderList(TopDivideOrderQueryBo bo) {
         List<TopDivideOrderVo> fList = baseMapper.getFinishList(bo);
-        List<TopDivideOrderVo> rList = baseMapper.getRefundList(bo);
+        List<TopDivideOrderVo> rList;
+        if(Validator.isEmpty(bo.getRoleId())){
+            rList = baseMapper.getRefundList(bo);
+        }else{
+            rList = new ArrayList<>();
+        }
+
         for(TopDivideOrderVo vo : rList){
             if(vo.getPayStatus()==1){
                 vo.setCheckStatus(3);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopDivideOrderVo.java

@@ -95,5 +95,6 @@ public class TopDivideOrderVo {
 	private String createNo;
 	@ApiModelProperty("佣金")
 	private BigDecimal brokerage;
-
+	@ApiModelProperty("角色名称")
+	private String roleName;
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             oo.remark,
             oo.divide_company_money,
             oo.divide_seller_money,
-            oo.brokerage
+            oo.brokerage,
+            r.role_name
         FROM
             top_divide_order tdo
                 LEFT JOIN top_divide_log dl ON tdo.divide_log_id = dl.id
@@ -33,9 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN v_top_order oo ON tdo.order_sn =  oo.order_sn
                 LEFT JOIN
             top_old_order_check_log cl ON (dl.divide_type+1) = cl.check_from AND  cl.check_sign = 1  AND  tdo.order_sn = cl.order_sn
+            LEFT JOIN top_sys_role r ON cl.role_id = r.role_id
         WHERE
             tdo.order_type = 1
           AND tdo.divide_log_id = #{divideLogId}
+        <if test="roleId != null and roleId != ''">
+            AND cl.role_id = #{roleId}
+        </if>
     </select>
 
     <select id="getRefundList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">