Sfoglia il codice sorgente

企业同步问题

wangmh 7 anni fa
parent
commit
2beefeab9c

+ 3 - 3
sso-common/src/main/java/com/uas/sso/entity/UserSpaceView.java

@@ -34,7 +34,7 @@ public class UserSpaceView implements Serializable {
     /**
      * 注册日期
      */
-    private Date registerDate;
+    private Long registerDate;
 
     /**
      * 管理员
@@ -115,11 +115,11 @@ public class UserSpaceView implements Serializable {
         this.corporation = corporation;
     }
 
-    public Date getRegisterDate() {
+    public Long getRegisterDate() {
         return registerDate;
     }
 
-    public void setRegisterDate(Date registerDate) {
+    public void setRegisterDate(Long registerDate) {
         this.registerDate = registerDate;
     }
 

+ 1 - 1
sso-server/src/main/java/com/uas/sso/entity/Userspace.java

@@ -555,7 +555,7 @@ public class Userspace implements Serializable {
         userSpaceView.setSpaceUU(this.getSpaceUU());
         userSpaceView.setSpaceName(this.getSpaceName());
         userSpaceView.setCorporation(this.getCorporation());
-        userSpaceView.setRegisterDate(this.getRegisterDate());
+        userSpaceView.setRegisterDate(this.getRegisterDate().getTime());
         userSpaceView.setAdmin(this.getAdmin().toView());
         userSpaceView.setBusinessCode(this.getBusinessCode());
         userSpaceView.setBusinessCodeImage(this.getBusinessCodeImage());

+ 1 - 1
sso-server/src/main/java/com/uas/sso/service/impl/UserServiceImpl.java

@@ -531,7 +531,7 @@ public class UserServiceImpl implements UserService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        User finalUser = user;
+        final User finalUser = user;
         ExecuteUtils.execute(new ICallable<Void, String>() {
 
             @Override

+ 2 - 0
sso-server/src/main/java/com/uas/sso/service/impl/UserspaceServiceImpl.java

@@ -111,6 +111,8 @@ public class UserspaceServiceImpl implements UserspaceService {
 
     private void syncUserSpaceInfo(final UserSpaceView userSpaceView, final String msg) {
         List<String> apps = appService.findUid();
+        userSpaceView.setAdminUU(userSpaceView.getAdmin().getUserUU());
+        userSpaceView.setAdmin(null);
 
         ExecuteUtils.execute(new ICallable<Void, String>() {
             @Override