~liusheng/smartor.git

			@@ -7,6 +7,7 @@
			import com.ruoyi.common.core.domain.entity.SysDept;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.domain.entity.SysUserDept;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.utils.SecurityUtils;
			@@ -16,6 +17,7 @@
			import com.ruoyi.system.service.ISysPostService;
			import com.ruoyi.system.service.ISysRoleService;
			import com.ruoyi.system.service.ISysUserService;
			import com.smartor.mapper.SysUserDeptMapper;
			import org.apache.commons.lang3.ArrayUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.security.access.prepost.PreAuthorize;
			@@ -46,6 +48,9 @@

			@Autowired
			private ISysPostService postService;

			@Autowired
			private SysUserDeptMapper sysUserDeptMapper;

			/**
			* 获取用户列表
			@@ -101,6 +106,18 @@
			ajax.put("postIds", postService.selectPostListByUserId(userId));
			ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
			}
			List<SysUserDept> sysUserDeptKSs = null;
			List<SysUserDept> sysUserDeptBQs = null;
			SysUserDept sysUserDept = new SysUserDept();
			sysUserDept.setUserId(userId);
			sysUserDept.setDeptType("1");
			sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
			ajax.put("belongDepts",sysUserDeptKSs);

			sysUserDept.setDeptType("2");
			sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
			ajax.put("belongWards",sysUserDeptBQs);

			return ajax;
			}

			@@ -120,7 +137,8 @@
			}
			user.setCreateBy(getUsername());
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			return toAjax(userService.insertUser(user));
			int i = userService.insertUser(user);
			return success(user.getUserId().intValue());
			}

			/**