ref:调整账号服务单个企业同步返回值

sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/impl/SyncToSsoServiceImpl.java

@@ -30,7 +30,7 @@ public class SyncToSsoServiceImpl implements SyncToSsoService {
      */
     @Override
     public void sendUserToSso(Long userUU) {
-        if (userUU == null) {
+        if (userUU == null || userUU == 0) {
             return;
         }
         try {
@@ -46,7 +46,7 @@ public class SyncToSsoServiceImpl implements SyncToSsoService {
      */
     @Override
     public void sendUserspaceToSso(Long spaceUU) {
-        if (spaceUU == null) {
+        if (spaceUU == null || spaceUU == 0) {
             return;
         }
         try {

sso-server/src/main/java/com/uas/sso/sync/entity/SyncUserspace.java

@@ -2,8 +2,6 @@ package com.uas.sso.sync.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.sso.entity.App;
-import com.uas.sso.entity.Relation;
-import com.uas.sso.entity.User;
 import com.uas.sso.entity.UserSpaceView;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
@@ -252,7 +250,7 @@ public class SyncUserspace {
     @JoinTable(name = "sso$user_userspace",
             joinColumns = {@JoinColumn(name="space_uu", referencedColumnName="spaceuu")},
             inverseJoinColumns = {@JoinColumn(name="user_uu", referencedColumnName="useruu")})
-    private List<SyncUser> users;
+    private List<SyncUserspaceUsers> users;
 
     /**
      * 企业开通的应用
@@ -549,11 +547,11 @@ public class SyncUserspace {
         this.website = website;
     }
 
-    public List<SyncUser> getUsers() {
+    public List<SyncUserspaceUsers> getUsers() {
         return users;
     }
 
-    public void setUsers(List<SyncUser> users) {
+    public void setUsers(List<SyncUserspaceUsers> users) {
         this.users = users;
     }
 

sso-server/src/main/java/com/uas/sso/sync/entity/SyncUserspaceUsers.java

@@ -0,0 +1,27 @@
+package com.uas.sso.sync.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author liusw
+ * @date 2019-03-05 11:42
+ */
+@Entity
+@Table(name = "sso$user")
+public class SyncUserspaceUsers {
+
+    @Id
+    @Column(name = "useruu")
+    private Long userUU;
+
+    public Long getUserUU() {
+        return userUU;
+    }
+
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
+    }
+}

sso-server/src/main/java/com/uas/sso/sync/service/impl/SyncUserServiceImpl.java

@@ -93,7 +93,7 @@ public class SyncUserServiceImpl implements SyncUserService {
 
     @Override
     public void syncUserInfoByUserUU(Long userUU, boolean isUpdate) throws Exception {
-        if (userUU == null) {
+        if (userUU == null || userUU == 0) {
             throw new RuntimeException("用户uu不能为空");
         }
         // 到账号服务查询用户信息

sso-server/src/main/java/com/uas/sso/sync/service/impl/SyncUserspaceServiceImpl.java

@@ -121,8 +121,9 @@ public class SyncUserspaceServiceImpl implements SyncUserspaceService {
             syncUserspace.setUsers(null);
         }
 
-        List<SyncUser> syncUsers = new ArrayList<>();
+        List<SyncUserspaceUsers> syncUsers = new ArrayList<>();
         SyncUser adminUser = null;
+        SyncUserspaceUsers syncUserspaceUsers = new SyncUserspaceUsers();
         for (Integer uu : userUu) {
             SyncUser syncUser = syncUserDao.findOne(Long.valueOf(uu));
             if (syncUser == null) {
@@ -134,7 +135,8 @@ public class SyncUserspaceServiceImpl implements SyncUserspaceService {
             if (uu.equals(ssoServiceUserspace.getAdminuu())) {
                 adminUser = syncUser;
             }
-            syncUsers.add(syncUser);
+            syncUserspaceUsers.setUserUU(uu.longValue());
+            syncUsers.add(syncUserspaceUsers);
         }
         List<App> apps = appService.findDefaultUseApp();
         syncUserspace.setApps(apps);
@@ -150,7 +152,7 @@ public class SyncUserspaceServiceImpl implements SyncUserspaceService {
      */
     @Override
     public void sendUserspaceToSso(Long spaceUU) {
-        if (spaceUU == null) {
+        if (spaceUU == null || spaceUU == 0) {
             return;
         }
         try {