From 701539ca54bf08267bbf669188797669b9335811 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 07 Nov 2023 16:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..faf522d 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
@@ -15,7 +15,7 @@
import com.moral.api.pojo.enums.FileTableEnum;
import com.moral.api.pojo.enums.StateEnum;
import com.moral.api.pojo.enums.SysDictTypeEnum;
-import com.moral.api.pojo.query.app.AppAllocationPushUserCond;
+
import com.moral.api.pojo.vo.file.FileVo;
import com.moral.api.service.FileTableService;
import com.moral.api.service.ResponsibilityUnitService;
@@ -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}")
@@ -237,15 +239,14 @@
}
- @Autowired
- private ResponsibilityUnitService responsibilityUnitService;
+
/**
* ���������������
* @param appAllocationPushUserCond
*/
@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