|
@@ -5,8 +5,6 @@ import cn.com.ctop.common.module.annotation.PermissionData;
|
|
|
import cn.com.ctop.common.module.entity.SysRole;
|
|
|
import cn.com.ctop.common.module.entity.SysUser;
|
|
|
import cn.com.ctop.common.module.model.SysUserSysDepartModel;
|
|
|
-import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
|
-import cn.com.ctop.common.module.utils.Check;
|
|
|
import cn.com.ctop.common.module.vo.SysDepartUsersVO;
|
|
|
import cn.com.ctop.common.module.vo.SysUserRoleVO;
|
|
|
import cn.com.ctop.common.module.vo.SysUserVo;
|
|
@@ -32,8 +30,6 @@ import org.jeecg.common.util.PasswordUtil;
|
|
|
import org.jeecg.common.util.PmsUtil;
|
|
|
import org.jeecg.common.util.RedisUtil;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
-import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
|
-import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
|
import org.jeecg.modules.system.entity.*;
|
|
|
import org.jeecg.modules.system.mapper.UserCompanyMapper;
|
|
|
import org.jeecg.modules.system.model.DepartIdModel;
|
|
@@ -103,11 +99,16 @@ public class SysUserController {
|
|
|
private RedisUtil redisUtil;
|
|
|
@Value("${jeecg.path.upload}")
|
|
|
private String upLoadPath;
|
|
|
+
|
|
|
@RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
|
|
|
public Map<String, Object> getRoleInfo(String userId) {
|
|
|
Map<String, Object> map = sysUserService.queryRoleCode(userId);
|
|
|
return map;
|
|
|
}
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private UserCompanyMapper userCompanyMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 获取用户列表数据
|
|
|
* @param user
|
|
@@ -142,10 +143,6 @@ public class SysUserController {
|
|
|
log.info(pageList.toString());
|
|
|
return result;
|
|
|
}
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private UserCompanyMapper userCompanyMapper;
|
|
|
-
|
|
|
@RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
|
|
|
public Result<List<SysUserVo>> getAllUserListByCompany() {
|
|
|
Result<List<SysUserVo>> result = new Result<>();
|