From 447e26999bfdd1e1cd095b48b45b4dbd3f98842b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 21 May 2026 17:45:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E5=B8=8331;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- mhd-gateway/src/main/resources/bootstrap.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 4a79cdac0..f6477f04b 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index 57f832f9f..d57c0431b 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -9,7 +9,7 @@ spring: name: mhd-gateway profiles: # 环境配置 - active: dev + active: dev31 cloud: nacos: discovery: From 6d4d3c83596c677867bca8c7e0a05d72186ea73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 22 May 2026 11:15:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E5=B8=8331;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-gateway/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index d57c0431b..57f832f9f 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -9,7 +9,7 @@ spring: name: mhd-gateway profiles: # 环境配置 - active: dev31 + active: dev cloud: nacos: discovery: From dc65b1ae1219615f39e8caa456c7021b395b2824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Fri, 22 May 2026 14:22:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A7=94=E6=89=98?= =?UTF-8?q?=E6=96=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/application/service/UserApplicationService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index 32642d0ee..ed69773e1 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -2115,7 +2115,12 @@ public class UserApplicationService { //同步网货平台员工信息 wlhyDomainService.addOrEditPlatformUser(userEntity); //同步yms员工信息 - ymsDomainService.addOrEditYmsUser(userEntity); + Long organizationId = loginUser.getUserPo().getOrganizationId(); + Integer ordIsQueue = userMapper.getOrdIsQueue(organizationId); + if (userEntity.getUserAccount()!=null&&ordIsQueue==1){ + //同步yms员工信息 + ymsDomainService.addOrEditYmsUser(userEntity); + } BeanUtils.copyProperties(userPo, userEntity);