From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
index a2baf7c..5087d55 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -1,10 +1,15 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
+import com.taobao.api.ApiException;
+import shade.com.alibaba.fastjson2.JSONObject;
+
import java.util.List;
/**
@@ -34,7 +39,7 @@
*
* @param id 涓婚敭
*/
- void deleteById(Integer id);
+ void deleteById(Integer id, LoginUserInfo user);
/**
* 鍒犻櫎
@@ -48,7 +53,7 @@
*
* @param ids 涓婚敭闆�
*/
- void deleteByIdInBatch(List<Integer> ids);
+ void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user);
/**
* 涓婚敭鏇存柊
@@ -124,4 +129,8 @@
List<Company> companyTree(Integer type);
void updateSort(UpdateCompanySortDTO dto);
+
+ void ddPushCompanyInfo(String eventType, JSONObject eventData) throws ApiException;
+
+ String syncDDCompany()throws ApiException;
}
--
Gitblit v1.9.3