From ed120bbf70dd49774dd7b1db31d3bb81d47154e0 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 11 Mar 2026 10:16:36 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20tms-oa=E6=8E=A5=E5=8F=A3-?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=8F=90=E6=88=90=E5=AE=9E=E6=97=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5OA=E5=B7=A5=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiweb/CommissionProfitController.java    | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommissionProfitController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommissionProfitController.java
index 2713072..a625973 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommissionProfitController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommissionProfitController.java
@@ -31,6 +31,7 @@ import com.xdadan.erp.emis.service.IEmisCommissionDtlService;
 import com.xdadan.erp.emis.service.IEmisCommissionProfitService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import com.xdadan.erp.system.service.ISysUserService;
+import com.xdadan.erp.common.core.domain.entity.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,8 +41,10 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -81,9 +84,62 @@ public class CommissionProfitController extends BaseController
 
         startPage();
         List<EmisCommissionProfit> list = emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit);
+
+        // 将每个对象的oaEmpCode设置到params中
+        if (list != null && !list.isEmpty()) {
+            for (EmisCommissionProfit item : list) {
+                try {
+                    // 通过empName查询获取oaEmpCode
+                    String oaEmpCode = getOaEmpCodeByEmpName(item);
+//                    if (StringUtils.isNotEmpty(oaEmpCode)) {
+//                        // 确保params不为null
+//                        if (item.getParams() == null) {
+//                            item.setParams(new HashMap<>());
+//                        }
+//                        // 将oaEmpCode设置到params中
+//                        item.getParams().put("oaEmpCode", oaEmpCode);
+//                    }
+                    // 将oaEmpCode设置到params中
+                    item.getParams().put("oaEmpCode", oaEmpCode);
+                } catch (Exception e) {
+                    // 忽略异常，继续处理下一个对象
+                    log.debug("设置oaEmpCode到params失败: {}", e.getMessage());
+                }
+            }
+        }
+
         return getDataTable(list);
     }
 
+    /**
+     * 通过empName查询用户，获取oaEmpCode
+     */
+    private String getOaEmpCodeByEmpName(EmisCommissionProfit item) {
+        if (item == null || sysUserService == null) {
+            return null;
+        }
 
+        try {
+            String empName = item.getEmpName();
+            if (StringUtils.isEmpty(empName)) {
+                return null;
+            }
+
+            // 使用empName查询用户
+            SysUser queryUser = new SysUser();
+            queryUser.setEmpName(empName);
+            List<SysUser> userList = sysUserService.selectUserList(queryUser);
+
+            if (userList != null && !userList.isEmpty()) {
+                // 取第一个用户
+                SysUser user = userList.get(0);
+                return user.getOaEmpCode();
+            }
+        } catch (Exception e) {
+            log.debug("通过empName查询oaEmpCode失败: {}", e.getMessage());
+        }
+
+        return null;
+    }
 
 }