소스 검색

更新!

TRX 1 년 전
부모
커밋
71c3736173
1개의 변경된 파일11개의 추가작업 그리고 1개의 파일을 삭제
  1. 11 1
      FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

+ 11 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -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);
 
         // 通知人脸信息发送变化