From 6730b47bed29024618166dc2802277dcd351587c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 08 一月 2026 15:58:39 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
server/startsh/启动脚本和日志处理脚本说明.txt | 9
server/startsh/service_start_new.sh | 13 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 1
server/startsh/admin_start.sh | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 712 ------------------------------------------------------
5 files changed, 29 insertions(+), 710 deletions(-)
diff --git a/server/startsh/admin_start.sh b/server/startsh/admin_start.sh
index 7b11a6c..754fdbf 100644
--- a/server/startsh/admin_start.sh
+++ b/server/startsh/admin_start.sh
@@ -6,15 +6,13 @@
/usr/local/nginx/sbin/nginx
-/usr/local/nacos/nacos/bin/startup.sh -m standalone
+/usr/local/nacos/bin/startup.sh -m standalone
nohup java -jar /usr/local/jars/wuhuyancao/system_gateway.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/wuhuyancao/admin_timer.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/wuhuyancao/system_timer.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/wuhuyancao/admin_interface.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/wuhuyancao/meeting_admin.jar > /dev/null 2>&1 &
-
-
cd /usr/local/ortools/java_or-tools
diff --git a/server/startsh/service_start_new.sh b/server/startsh/service_start_new.sh
new file mode 100644
index 0000000..0a1acda
--- /dev/null
+++ b/server/startsh/service_start_new.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+killall java
+
+bash /usr/local/nacos/bin/shutdown.sh
+bash /usr/local/nacos/bin/startup.sh -m standalone
+
+nohup java -jar /usr/local/jars/wuhuyancao/system_gateway.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/admin_timer.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/system_timer.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/admin_interface.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/meeting_admin.jar > /dev/null 2>&1 &
+
+
diff --git "a/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt" "b/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
index c1fc2a6..daa4274 100644
--- "a/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
+++ "b/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
@@ -8,6 +8,15 @@
crontab -e
#鍔犲叆鎵ц浠诲姟 姣忓ぉ鍑屾櫒鎵ц
0 0 * * * /usr/local/jars/startsh/logByDate.sh
+
+
+3.寮�鏈哄惎鍔ㄦ湇鍔″钩鍙版湇鍔¤剼鏈細
+#鎵ц
+crontab -e
+#鍔犲叆鎵ц浠诲姟 姣忓ぉ鍑屾櫒鎵ц
+@reboot sleep 300 && /usr/local/jars/service_start_new.sh
+
+
#鎸塃sc閿悗鍐嶈緭鍏�:wq锛�,鍥炶溅淇濆瓨
#鏌ョ湅鏄惁鍒涘缓鎴愬姛
crontab -l
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 34f3fb1..6f70365 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -29,6 +29,8 @@
import com.doumee.core.jiandaoyun.api.arch.DeptApiClient;
import com.doumee.core.jiandaoyun.constants.HttpConstant;
import com.doumee.core.jiandaoyun.model.dept.DeptEntityModel;
+import com.doumee.core.jiandaoyun.model.request.BasePushRequest;
+import com.doumee.core.jiandaoyun.model.request.MemberPushData;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.third.model.LoginUserInfo;
@@ -961,714 +963,12 @@
}
public static void main(String[] args) {
- String temp = " [{" +
- "\"dept_no\": 567064650," +
- "\"name\": \"瀹¤娲鹃┗鍔瀄"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567064650\"" +
- "}, {" +
- "\"dept_no\": 567086523," +
- "\"name\": \"姹熷寳鍒嗗眬\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567086523\"" +
- "}, {" +
- "\"dept_no\": 567354485," +
- "\"name\": \"绂诲矖閫�鍏讳汉鍛榎"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567354485\"" +
- "}, {" +
- "\"dept_no\": 567303494," +
- "\"name\": \"绾鐩戝療瀹わ紙宸″療棰嗗灏忕粍鍔炲叕瀹わ級\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567303494\"" +
- "}, {" +
- "\"dept_no\": 566874731," +
- "\"name\": \"鏃犱负甯傚眬绂婚��浼戝姙\"," +
- "\"parent_no\": 566426902," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566874731\"" +
- "}, {" +
- "\"dept_no\": 566426902," +
- "\"name\": \"绂婚��浼戜汉鍛樺\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566426902\"" +
- "}, {" +
- "\"dept_no\": 566981590," +
- "\"name\": \"鐗╂祦涓績\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566981590\"" +
- "}, {" +
- "\"dept_no\": 566499662," +
- "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566499662\"" +
- "}, {" +
- "\"dept_no\": 567258434," +
- "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567258434\"" +
- "}, {" +
- "\"dept_no\": 567458554," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊绉戯紙鍐呴儴涓撳崠绠＄悊鐩戠潱绉戙�佺ń鏌ユ敮闃燂級\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567458554\"" +
- "}, {" +
- "\"dept_no\": 567139640," +
- "\"name\": \"婀炬矚鍖哄眬绂婚��浼戝姙\"," +
- "\"parent_no\": 566426902," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567139640\"" +
- "}, {" +
- "\"dept_no\": 566379775," +
- "\"name\": \"淇℃伅涓績\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566379775\"" +
- "}, {" +
- "\"dept_no\": 567298538," +
- "\"name\": \"浼佷笟绠＄悊绉慭"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567298538\"" +
- "}, {" +
- "\"dept_no\": 567073617," +
- "\"name\": \"鍔炲叕瀹"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567073617\"" +
- "}, {" +
- "\"dept_no\": 566496812," +
- "\"name\": \"绻佹槍鍖哄眬绂婚��浼戝姙\"," +
- "\"parent_no\": 566426902," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566496812\"" +
- "}, {" +
- "\"dept_no\": 566643894," +
- "\"name\": \"鍗楅櫟鍘垮眬绂婚��浼戝姙\"," +
- "\"parent_no\": 566426902," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566643894\"" +
- "}, {" +
- "\"dept_no\": 566699927," +
- "\"name\": \"娉曡绉戯紙瑙勮寖绠＄悊鍔炲叕瀹わ級\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566699927\"" +
- "}, {" +
- "\"dept_no\": 567034633," +
- "\"name\": \"鍏氬缓缇ゅ洟绉戯紙宸ヤ細鍔炲叕瀹わ級\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567034633\"" +
- "}, {" +
- "\"dept_no\": 567095650," +
- "\"name\": \"甯傚眬锛堝叕鍙革級棰嗗\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567095650\"" +
- "}, {" +
- "\"dept_no\": 566464722," +
- "\"name\": \"璐㈠姟绠＄悊绉慭"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566464722\"" +
- "}, {" +
- "\"dept_no\": 567249497," +
- "\"name\": \"鑺滄箹甯傚眬鐩村睘鍒嗗眬\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567249497\"" +
- "}, {" +
- "\"dept_no\": 567266572," +
- "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567266572\"" +
- "}, {" +
- "\"dept_no\": 567394584," +
- "\"name\": \"绂婚��浼戜汉鍛樺\"," +
- "\"parent_no\": 566426902," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567394584\"" +
- "}, {" +
- "\"dept_no\": 566952603," +
- "\"name\": \"瀹夊叏绠＄悊绉慭"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566952603\"" +
- "}, {" +
- "\"dept_no\": 567418536," +
- "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567418536\"" +
- "}, {" +
- "\"dept_no\": 567080624," +
- "\"name\": \"钀ラ攢涓績\"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567080624\"" +
- "}, {" +
- "\"dept_no\": 567395495," +
- "\"name\": \"浜哄姏璧勬簮绉慭"," +
- "\"parent_no\": 483636217," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567395495\"" +
- "}, {" +
- "\"dept_no\": 566852695," +
- "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級鍔炲叕瀹"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566852695\"" +
- "}, {" +
- "\"dept_no\": 566597911," +
- "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級瑗勫畨鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566597911\"" +
- "}, {" +
- "\"dept_no\": 567383562," +
- "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級瀹㈡埛鏈嶅姟閮╘"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567383562\"" +
- "}, {" +
- "\"dept_no\": 566596757," +
- "\"name\": \"棰嗗鐝瓙\"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566596757\"" +
- "}, {" +
- "\"dept_no\": 567126588," +
- "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級鍩庡尯鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567126588\"" +
- "}, {" +
- "\"dept_no\": 567423457," +
- "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級鐩戝療娉曡鍔瀄"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567423457\"" +
- "}, {" +
- "\"dept_no\": 567444447," +
- "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級楂樻矡鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567444447\"" +
- "}, {" +
- "\"dept_no\": 566688696," +
- "\"name\": \"鏃犱负甯傚眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566688696\"" +
- "}, {" +
- "\"dept_no\": 567308492," +
- "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
- "\"parent_no\": 567266572," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567308492\"" +
- "}, {" +
- "\"dept_no\": 567311569," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
- "\"parent_no\": 566499662," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567311569\"" +
- "}, {" +
- "\"dept_no\": 566586834," +
- "\"name\": \"鐗╂祦涓績鍌ㄩ厤閮╘"," +
- "\"parent_no\": 566981590," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566586834\"" +
- "}, {" +
- "\"dept_no\": 567052635," +
- "\"name\": \"绋芥煡闃焅"," +
- "\"parent_no\": 566930600," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567052635\"" +
- "}, {" +
- "\"dept_no\": 567250603," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
- "\"parent_no\": 567418536," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567250603\"" +
- "}, {" +
- "\"dept_no\": 566714645," +
- "\"name\": \"鐗╂祦涓績閫佽揣閮╘"," +
- "\"parent_no\": 566981590," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566714645\"" +
- "}, {" +
- "\"dept_no\": 567400554," +
- "\"name\": \"鐗╂祦涓績缁煎悎閮╘"," +
- "\"parent_no\": 566981590," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567400554\"" +
- "}, {" +
- "\"dept_no\": 901575528," +
- "\"name\": \"鐗╂祦涓績鎶�鏈儴\"," +
- "\"parent_no\": 566981590," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"901575528\"" +
- "}, {" +
- "\"dept_no\": 567406402," +
- "\"name\": \"鐗╂祦涓績瀹変繚閮╘"," +
- "\"parent_no\": 566981590," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567406402\"" +
- "}, {" +
- "\"dept_no\": 667523393," +
- "\"name\": \"鐗╂祦涓績棰嗗\"," +
- "\"parent_no\": 566981590," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"667523393\"" +
- "}, {" +
- "\"dept_no\": 567052636," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
- "\"parent_no\": 567249497," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567052636\"" +
- "}, {" +
- "\"dept_no\": 567351557," +
- "\"name\": \"鐗╂祦涓績涓浆绔橽"," +
- "\"parent_no\": 566981590," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567351557\"" +
- "}, {" +
- "\"dept_no\": 567052634," +
- "\"name\": \"姹熷寳鍒嗗眬鍔炲叕瀹"," +
- "\"parent_no\": 567086523," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567052634\"" +
- "}, {" +
- "\"dept_no\": 567359469," +
- "\"name\": \"鍝佺墝閮╘"," +
- "\"parent_no\": 567080624," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567359469\"" +
- "}, {" +
- "\"dept_no\": 821923828," +
- "\"name\": \"缁煎悎閮╘"," +
- "\"parent_no\": 567080624," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"821923828\"" +
- "}, {" +
- "\"dept_no\": 567151607," +
- "\"name\": \"姹熷寳鍒嗗眬涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
- "\"parent_no\": 567086523," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567151607\"" +
- "}, {" +
- "\"dept_no\": 567297546," +
- "\"name\": \"甯傚満閮╘"," +
- "\"parent_no\": 567080624," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567297546\"" +
- "}, {" +
- "\"dept_no\": 566867618," +
- "\"name\": \"缁堢閮╘"," +
- "\"parent_no\": 567080624," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566867618\"" +
- "}, {" +
- "\"dept_no\": 567314532," +
- "\"name\": \"璁㈠崟閮╘"," +
- "\"parent_no\": 567080624," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567314532\"" +
- "}, {" +
- "\"dept_no\": 566848639," +
- "\"name\": \"姹熷寳鍒嗗眬鐩戝療娉曡鍔瀄"," +
- "\"parent_no\": 567086523," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566848639\"" +
- "}, {" +
- "\"dept_no\": 567272560," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級瀵勯�掔粍\"," +
- "\"parent_no\": 567258434," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567272560\"" +
- "}, {" +
- "\"dept_no\": 566564826," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
- "\"parent_no\": 567258434," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566564826\"" +
- "}, {" +
- "\"dept_no\": 567471441," +
- "\"name\": \"姹熷寳鍒嗗眬瀹㈡埛鏈嶅姟閮╘"," +
- "\"parent_no\": 567086523," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567471441\"" +
- "}, {" +
- "\"dept_no\": 711701716," +
- "\"name\": \"姹熷寳鍒嗗眬鍩庡寳鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯锛塡"," +
- "\"parent_no\": 567086523," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"711701716\"" +
- "}, {" +
- "\"dept_no\": 567103611," +
- "\"name\": \"棰嗗鐝瓙\"," +
- "\"parent_no\": 567086523," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567103611\"" +
- "}, {" +
- "\"dept_no\": 664801291," +
- "\"name\": \"姹熷寳鍒嗗眬浜屽潩鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯锛塡"," +
- "\"parent_no\": 567086523," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"664801291\"" +
- "}, {" +
- "\"dept_no\": 566323801," +
- "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級鍔炲叕瀹"," +
- "\"parent_no\": 567258434," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566323801\"" +
- "}, {" +
- "\"dept_no\": 567343637," +
- "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級鍩庡尯鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
- "\"parent_no\": 567258434," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567343637\"" +
- "}, {" +
- "\"dept_no\": 567087584," +
- "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級鐩戝療娉曡鍔瀄"," +
- "\"parent_no\": 567258434," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567087584\"" +
- "}, {" +
- "\"dept_no\": 567058556," +
- "\"name\": \"瀹㈡埛鏈嶅姟閮╘"," +
- "\"parent_no\": 567249497," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567058556\"" +
- "}, {" +
- "\"dept_no\": 566930600," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
- "\"parent_no\": 567249497," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566930600\"" +
- "}, {" +
- "\"dept_no\": 566592977," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級琛屽姩缁刓"," +
- "\"parent_no\": 567086523," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566592977\"" +
- "}, {" +
- "\"dept_no\": 567283502," +
- "\"name\": \"棰嗗鐝瓙\"," +
- "\"parent_no\": 567249497," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567283502\"" +
- "}, {" +
- "\"dept_no\": 567571030," +
- "\"name\": \"鐩戝療娉曡鍔瀄"," +
- "\"parent_no\": 567249497," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567571030\"" +
- "}, {" +
- "\"dept_no\": 566605742," +
- "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級瀹㈡埛鏈嶅姟閮╘"," +
- "\"parent_no\": 567258434," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566605742\"" +
- "}, {" +
- "\"dept_no\": 567044634," +
- "\"name\": \"棰嗗鐝瓙\"," +
- "\"parent_no\": 567258434," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567044634\"" +
- "}, {" +
- "\"dept_no\": 566835635," +
- "\"name\": \"鍔炲叕瀹"," +
- "\"parent_no\": 567249497," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566835635\"" +
- "}, {" +
- "\"dept_no\": 566844724," +
- "\"name\": \"鍩庡崡鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
- "\"parent_no\": 567249497," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566844724\"" +
- "}, {" +
- "\"dept_no\": 566633782," +
- "\"name\": \"棰嗗鐝瓙\"," +
- "\"parent_no\": 567266572," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566633782\"" +
- "}, {" +
- "\"dept_no\": 566884644," +
- "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級瀹㈡埛鏈嶅姟閮╘"," +
- "\"parent_no\": 567266572," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566884644\"" +
- "}, {" +
- "\"dept_no\": 566656760," +
- "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
- "\"parent_no\": 567266572," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566656760\"" +
- "}, {" +
- "\"dept_no\": 567127606," +
- "\"name\": \"婀炬矚鍖哄眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
- "\"parent_no\": 567258434," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567127606\"" +
- "}, {" +
- "\"dept_no\": 566965621," +
- "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級鐩戝療娉曡鍔瀄"," +
- "\"parent_no\": 567266572," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566965621\"" +
- "}, {" +
- "\"dept_no\": 566889723," +
- "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級鍩庡尯鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
- "\"parent_no\": 567266572," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566889723\"" +
- "}, {" +
- "\"dept_no\": 573565486," +
- "\"name\": \"鍗楅櫟鍘垮眬锛堣惀閿�閮級鍔炲叕瀹"," +
- "\"parent_no\": 567266572," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"573565486\"" +
- "}, {" +
- "\"dept_no\": 566880674," +
- "\"name\": \"鍗楅櫟鍘垮眬绂诲矖閫�鍏讳汉鍛榎"," +
- "\"parent_no\": 567354485," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566880674\"" +
- "}, {" +
- "\"dept_no\": 567176623," +
- "\"name\": \"绻佹槍鍘垮眬绂诲矖閫�鍏讳汉鍛榎"," +
- "\"parent_no\": 567354485," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567176623\"" +
- "}, {" +
- "\"dept_no\": 567314533," +
- "\"name\": \"鑺滄箹甯傚眬绂诲矖閫�鍏讳汉鍛榎"," +
- "\"parent_no\": 567354485," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567314533\"" +
- "}, {" +
- "\"dept_no\": 567340287," +
- "\"name\": \"鏃犱负鍘垮眬绂诲矖閫�鍏讳汉鍛榎"," +
- "\"parent_no\": 567354485," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567340287\"" +
- "}, {" +
- "\"dept_no\": 566636715," +
- "\"name\": \"鑺滄箹鍘垮眬绂诲矖閫�鍏讳汉鍛榎"," +
- "\"parent_no\": 567354485," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566636715\"" +
- "}, {" +
- "\"dept_no\": 567368506," +
- "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級鐩戝療娉曡鍔瀄"," +
- "\"parent_no\": 567418536," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567368506\"" +
- "}, {" +
- "\"dept_no\": 567354486," +
- "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級鍔炲叕瀹"," +
- "\"parent_no\": 567418536," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567354486\"" +
- "}, {" +
- "\"dept_no\": 566960827," +
- "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級涓撳崠鐩戠潱绠＄悊鍔炲叕瀹わ紙鍐呴儴涓撳崠绠＄悊鐩戠潱鍔炲叕瀹ゃ�佺ń鏌ュぇ闃燂級\"," +
- "\"parent_no\": 567418536," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566960827\"" +
- "}, {" +
- "\"dept_no\": 566649730," +
- "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級鍩庡尯鐑熻崏涓撳崠绠＄悊鎵�锛堟湇鍔＄珯銆佺ń鏌ヤ腑闃燂級\"," +
- "\"parent_no\": 567418536," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566649730\"" +
- "}, {" +
- "\"dept_no\": 566455834," +
- "\"name\": \"绻佹槍鍖哄眬锛堣惀閿�閮級瀹㈡埛鏈嶅姟閮╘"," +
- "\"parent_no\": 567418536," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566455834\"" +
- "}, {" +
- "\"dept_no\": 566975648," +
- "\"name\": \"棰嗗鐝瓙\"," +
- "\"parent_no\": 567418536," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"566975648\"" +
- "}, {" +
- "\"dept_no\": 822153494," +
- "\"name\": \"鍖哄煙鍒嗕腑蹇僜"," +
- "\"parent_no\": 567458554," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"822153494\"" +
- "}, {" +
- "\"dept_no\": 567328559," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊绉戯紙鍐呴儴涓撳崠绠＄悊鐩戠潱绉戙�佺ń鏌ユ敮闃燂級琛屽姩缁刓"," +
- "\"parent_no\": 567458554," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567328559\"" +
- "}, {" +
- "\"dept_no\": 567476616," +
- "\"name\": \"涓撳崠鐩戠潱绠＄悊绉戯紙鍐呴儴涓撳崠绠＄悊鐩戠潱绉戙�佺ń鏌ユ敮闃燂級鏁版嵁鍒嗘瀽缁刓"," +
- "\"parent_no\": 567458554," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"567476616\"" +
- "}, {" +
- "\"dept_no\": 821950791," +
- "\"name\": \"鐜板満妫�鏌ョ粍\"," +
- "\"parent_no\": 822153494," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"821950791\"" +
- "}, {" +
- "\"dept_no\": 922652428," +
- "\"name\": \"缁煎悎绠＄悊缁刓"," +
- "\"parent_no\": 822153494," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"922652428\"" +
- "}, {" +
- "\"dept_no\": 822188538," +
- "\"name\": \"鏁版嵁鍒嗘瀽缁刓"," +
- "\"parent_no\": 822153494," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"822188538\"" +
- "}, {" +
- "\"dept_no\": 981649568," +
- "\"name\": \"閮ㄩ棬棰嗗\"," +
- "\"parent_no\": 567080624," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"981649568\"" +
- "}, {" +
- "\"dept_no\": 982346282," +
- "\"name\": \"閮ㄩ棬棰嗗\"," +
- "\"parent_no\": 567458554," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"982346282\"" +
- "}, {" +
- "\"dept_no\": 998004621," +
- "\"name\": \"閮ㄩ棬棰嗗\"," +
- "\"parent_no\": 822153494," +
- "\"type\": 0," +
- "\"status\": 1," +
- "\"integrate_id\": \"998004621\"" +
- "}]" ;
+ String temp = "{\"data\":{\"_id\":\"695f234fbb84d247f5e9eb69\",\"appId\":\"6954aca3cdf8fb470ca1aabd\",\"can_visit\":\"鍙嫓璁縗",\"code\":\"\",\"createTime\":\"2026-01-08T03:23:59.808Z\",\"creator\":{\"_id\":\"695490f0ea380dc657862993\",\"name\":\"姹熻悕\",\"status\":1,\"type\":0,\"username\":\"15345690849\"},\"deleteTime\":null,\"deleter\":null,\"depart_no\":\"567406402\",\"department\":{\"_id\":\"61b6fb6280e9de2aa1dfdd5c\",\"dept_no\":567406402,\"name\":\"鐗╂祦涓績瀹変繚閮╘",\"type\":0},\"entryId\":\"6954c7b47433108246904f1a\",\"formName\":\"鍐呴儴浜哄憳淇℃伅绠＄悊\",\"idcardno\":\"\",\"imgurl\":[],\"job_date\":null,\"master\":\"鍚",\"name\":\"寮犲厛瀹塡",\"phone\":\"18655366393\",\"position\":\"\",\"sex\":\"濂砛",\"status\":\"鍦ㄨ亴\",\"updateTime\":\"2026-01-08T03:57:37.222Z\",\"updater\":{\"_id\":\"695490f0ea380dc657862993\",\"name\":\"姹熻悕\",\"status\":1,\"type\":0,\"username\":\"15345690849\"},\"user\":{\"_id\":\"61b6fc187532c000077d34b1\",\"name\":\"寮犲厛瀹塡",\"status\":1,\"type\":0,\"username\":\"zhangxa\"},\"username\":\"zhangxa\"},\"op\":\"data_update\",\"opTime\":1767844657222}" ;
TypeReference typeReference =
- new TypeReference< List<DeptEntityModel> >() {
+ new TypeReference<BasePushRequest<MemberPushData>>() {
};
- List<DeptEntityModel> list = com.alibaba.fastjson.JSONObject.parseObject(temp, typeReference.getType());
- CompanyServiceImpl obj = new CompanyServiceImpl();
- list = obj.sortJdyListBYParent(list,483636217);
- list.size();
+ BasePushRequest<MemberPushData> list = com.alibaba.fastjson.JSONObject.parseObject(temp, typeReference.getType());
+ list.getData();
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index bd3711c..0798ec7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -445,7 +445,6 @@
if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ュ憳宸ヤ俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
}
- member.setSex(model.getSex());//榛樿鏄師鏉ョ殑鎬у埆
if (StringUtils.isNotBlank(member.getPhone()) ){
if ( !PhoneUtil.isPhone(member.getPhone())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鐢佃瘽鍙风爜鏍煎紡鏈夎");
--
Gitblit v1.9.3