|
|
@@ -4,7 +4,9 @@ import com.github.microservice.net.ResultContent;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.zhongshu.card.client.model.projectAbout.OrgUserFaceModel;
|
|
|
import com.zhongshu.card.client.model.projectAbout.OrgUserFaceParam;
|
|
|
+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;
|
|
|
@@ -41,6 +43,9 @@ public class OrgUserFaceService extends SuperService {
|
|
|
@Autowired
|
|
|
private DevicePermissEventService devicePermissEventService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private UserCountDao userCountDao;
|
|
|
+
|
|
|
/**
|
|
|
* 保存用户人脸信息
|
|
|
*
|
|
|
@@ -62,12 +67,17 @@ public class OrgUserFaceService extends SuperService {
|
|
|
OrgUserFace orgUserFace = orgUserFaceDao.findTopByUserIdAndProjectOid(userId, projectOid);
|
|
|
if (ObjectUtils.isEmpty(orgUserFace)) {
|
|
|
orgUserFace = new OrgUserFace();
|
|
|
- initEntity(orgUserFace);
|
|
|
+ initEntityNoCheckOid(orgUserFace);
|
|
|
} else {
|
|
|
initUpdateEntity(orgUserFace);
|
|
|
}
|
|
|
BeanUtils.copyProperties(param, orgUserFace);
|
|
|
orgUserFace.setProjectOid(projectOid);
|
|
|
+ UserAccount userAccount = userCountDao.findTopByUserId(userId);
|
|
|
+ orgUserFace.setUserId(userId);
|
|
|
+ if (ObjectUtils.isNotEmpty(userAccount)) {
|
|
|
+ orgUserFace.setUserAccount(userAccount);
|
|
|
+ }
|
|
|
orgUserFaceDao.save(orgUserFace);
|
|
|
|
|
|
// 通知人脸信息发送变化
|
