修改bug

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -70,6 +70,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Autowired
     protected Validator validator;
+    @Autowired
+    private SysOrgMapper sysOrgMapper;
 
     /**
      * 根据条件分页查询用户列表
@@ -91,6 +93,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         //查询条件
         QueryWrapper<SysUser> query = new QueryWrapper<>(user);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("parent_id", -1);
+        SysOrg sysOrg1 = sysOrgMapper.selectOne(queryWrapper);
+        if (null == user.getOrgId()) {
+            user.setOrgId(sysOrg1.getId());
+        }
         //下穿
         if (user.getCheckSub()) {
             List<Long> ids = orgService.selectCheckSubOrgIdList(user.getOrgId());
@@ -127,8 +135,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @return 用户信息集合信息
      */
     @Override
-    public List<SysUser> selectSyncUserList(SysUser user)
-    {
+    public List<SysUser> selectSyncUserList(SysUser user) {
         return userMapper.selectSyncUserList(user);
     }
 
@@ -182,7 +189,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public SysUser selectUserByUserName(String userName) {
-        return userMapper.selectOne(new QueryWrapper<SysUser>().eq("username", userName).eq("deleted",0));
+        return userMapper.selectOne(new QueryWrapper<SysUser>().eq("username", userName).eq("deleted", 0));
     }
 
     /**
@@ -315,7 +322,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public int insertUser(SysUser user) {
         user.setCreateTime(new Date());
         // 新增用户信息
-        SysOrg sysOrg = orgService.selectSysOrgById(user.getOrgId());user.setOrgName(sysOrg.getName());
+        SysOrg sysOrg = orgService.selectSysOrgById(user.getOrgId());
+        user.setOrgName(sysOrg.getName());
 
         int rows = userMapper.insert(user);
         // 新增用户岗位关联
@@ -356,7 +364,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         insertUserPost(user);
         user.setPassword(null);
         user.setSalt(null);
-        SysOrg sysOrg = orgService.selectSysOrgById(user.getOrgId());user.setOrgName(sysOrg.getName());
+        SysOrg sysOrg = orgService.selectSysOrgById(user.getOrgId());
+        user.setOrgName(sysOrg.getName());
         return userMapper.updateById(user);
     }