|
|
@@ -8,7 +8,6 @@ import com.zhongshu.card.server.core.dao.org.UserCountDao;
|
|
|
import com.zhongshu.card.server.core.dao.projectAbout.OrgUserFaceDao;
|
|
|
import com.zhongshu.card.server.core.domain.org.UserAccount;
|
|
|
import com.zhongshu.card.server.core.domain.projectAbout.OrgUserFace;
|
|
|
-import com.zhongshu.card.server.core.event.UserInfoChangeSyncEvent;
|
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
|
import com.zhongshu.card.server.core.service.devices.DevicePermissEventService;
|
|
|
import com.zhongshu.card.server.core.util.BeanUtils;
|
|
|
@@ -16,7 +15,6 @@ import com.zhongshu.card.server.core.util.CommonUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.kafka.common.protocol.types.Field;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.ApplicationContext;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -25,7 +23,6 @@ import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 项目人脸管理
|
|
|
@@ -103,14 +100,17 @@ public class OrgUserFaceService extends SuperService {
|
|
|
|
|
|
public ResultContent<OrgUserFaceModel> getUserFaceModel(String userId, String projectOid) {
|
|
|
if (StringUtils.isEmpty(userId)) {
|
|
|
+ // 得到当前用户的userId
|
|
|
userId = getCurrentUserId();
|
|
|
}
|
|
|
if (StringUtils.isEmpty(projectOid)) {
|
|
|
+ // 得到header里面的项目oid
|
|
|
projectOid = getCurrentProjectOid();
|
|
|
}
|
|
|
if (StringUtils.isEmpty(projectOid)) {
|
|
|
return ResultContent.buildFail("projectOid为空");
|
|
|
}
|
|
|
+
|
|
|
OrgUserFace entity = getUserFace(userId, projectOid);
|
|
|
return ResultContent.buildSuccess(toModel(entity));
|
|
|
}
|