From dab06e44d031aac4a951cfb01ba9545cc4772fa2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 07 Nov 2023 12:55:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index a603cbc..8b08a23 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -26,7 +26,6 @@
 import com.moral.constant.Constants;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.util.*;
-import com.sun.org.apache.regexp.internal.RE;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -77,6 +76,9 @@
 
     @Autowired
     private ResponsibilityUnitMapper responsibilityUnitMapper;
+
+    @Autowired
+    private ResponsibilityUnitService responsibilityUnitService;
 
 
     @Value("${AES.KEY}")
@@ -245,7 +247,7 @@
      */
     @Override
     @Async
-    public void pushOneUser(AppAllocationPushUserCond appAllocationPushUserCond) {
+    public void pushOneUser(Allocation appAllocationPushUserCond) {
 
         ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(appAllocationPushUserCond.getUnitId());
         Integer areaCode = responsibilityUnit.getAreaCode();

--
Gitblit v1.8.0