1.修复人员数据

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -229,12 +229,6 @@ public class ZkDataSyncTask {
                 jobs.add(job);
                 user.setJobs(jobs);
 
-                Set<Role> roles = new HashSet<Role>();
-                Role role = new Role();
-                role.setId(Long.valueOf(2));//普通用户
-                roles.add(role);
-                user.setRoles(roles);
-
                 dmUser = new DmUser();
                 dmUser.setDept(dept);
                 dmUser.setId(user.getId());
@@ -251,8 +245,6 @@ public class ZkDataSyncTask {
                 dmUser.setUserRootGroupName(user.getUserRootGroupName());
                 dmUser.setJobs(jobs);
 
-                dmUser.setRoles(roles);
-
                 try {
                     //1、入用户库
                     dmUserDto = dmUserService.findById(dmUser.getId());
@@ -260,12 +252,12 @@ public class ZkDataSyncTask {
                     if (dmUserDto != null) {
                         dmUserService.update(dmUser);
                     } else {
-//                        Set<Role> roles = new HashSet<Role>();
-//                        Role role = new Role();
-//                        role.setId(Long.valueOf(2));//普通用户
-//                        roles.add(role);
-//                        dmUser.setRoles(roles);
-//                        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
+                        Set<Role> roles = new HashSet<Role>();
+                        Role role = new Role();
+                        role.setId(Long.valueOf(2));//普通用户
+                        roles.add(role);
+                        dmUser.setRoles(roles);
+                        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
                         DmCardDto dmCardDto = dmCardService.create(new DmCard());
                         dmUser.setCardid(String.valueOf(dmCardDto.getId()));
                         dmUserService.create(dmUser);
@@ -278,22 +270,22 @@ public class ZkDataSyncTask {
                     if (userDto != null) {
                         //user.setPassword(passwordEncoder.encode("12345678"));
                         //user.setOssPassword(RsaUtils.encryptByPublicKey(RsaProperties.publicKey, "12345678"));
-//                        Set<Role> roles = new HashSet<Role>();
-//                        Role role = new Role();
-//                        for(RoleSmallDto roleSmallDto : userDto.getRoles()) {
-//                            role.setId(roleSmallDto.getId());//普通用户
-//                            roles.add(role);
-//                        }
-//                        user.setRoles(roles);
+                        Set<Role> roles = new HashSet<Role>();
+                        Role role = new Role();
+                        for(RoleSmallDto roleSmallDto : userDto.getRoles()) {
+                            role.setId(roleSmallDto.getId());//普通用户
+                            roles.add(role);
+                        }
+                        user.setRoles(roles);
                         userService.updateSync(user);
                         dmUser.setOssPassword(userDto.getOssPassword());
                         dmUserService.update(dmUser);
                     } else {
-//                        Set<Role> roles = new HashSet<Role>();
-//                        Role role = new Role();
-//                        role.setId(Long.valueOf(2));//普通用户
-//                        roles.add(role);
-//                        user.setRoles(roles);
+                        Set<Role> roles = new HashSet<Role>();
+                        Role role = new Role();
+                        role.setId(Long.valueOf(2));//普通用户
+                        roles.add(role);
+                        user.setRoles(roles);
                         user.setPassword(passwordEncoder.encode("12345678"));
                         String ossPassword = RsaUtils.encryptByPublicKey(RsaProperties.publicKey, "12345678");
                         user.setOssPassword(ossPassword);