|
@@ -15,6 +15,7 @@ import com.hssx.cloudmodel.mapper.UserMapper;
|
|
import com.hssx.cloudmodel.service.PowerService;
|
|
import com.hssx.cloudmodel.service.PowerService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.hssx.cloudmodel.util.HttpRespMsg;
|
|
import com.hssx.cloudmodel.util.HttpRespMsg;
|
|
|
|
+import com.hssx.cloudmodel.util.ListUtil;
|
|
import com.hssx.cloudmodel.util.PageUtil;
|
|
import com.hssx.cloudmodel.util.PageUtil;
|
|
import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
|
|
import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -47,22 +48,22 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
List<ProjectVO> list = new ArrayList<>();
|
|
List<ProjectVO> list = new ArrayList<>();
|
|
Integer type = 0;
|
|
Integer type = 0;
|
|
- PageHelper.startPage(page.getPageNum(),page.getPageSize());
|
|
|
|
|
|
+ PageHelper.startPage(page.getPageNum(), page.getPageSize());
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
|
|
QueryWrapper<Project> qw = new QueryWrapper<>();
|
|
QueryWrapper<Project> qw = new QueryWrapper<>();
|
|
Integer count = projectMapper.selectCount(qw.eq("manager_id", user.getId()));
|
|
Integer count = projectMapper.selectCount(qw.eq("manager_id", user.getId()));
|
|
- BeanUtils.copyProperties(user ,userVO);
|
|
|
|
|
|
+ BeanUtils.copyProperties(user, userVO);
|
|
if (user != null) {
|
|
if (user != null) {
|
|
if (Constant.SYS_PARENT_ID == user.getParentId()) {
|
|
if (Constant.SYS_PARENT_ID == user.getParentId()) {
|
|
//平台超级管理员
|
|
//平台超级管理员
|
|
msg.setError("对不起你不具备该项权限!");
|
|
msg.setError("对不起你不具备该项权限!");
|
|
} else if (Constant.SYS_ID == user.getParentId()) {
|
|
} else if (Constant.SYS_ID == user.getParentId()) {
|
|
//资产方管理员,展示此人创建所有项目对应的权限
|
|
//资产方管理员,展示此人创建所有项目对应的权限
|
|
- list = projectMapper.selectUserPowerList(userVO,type);
|
|
|
|
|
|
+ list = projectMapper.selectUserPowerList(userVO, type);
|
|
} else if (count > 0) {
|
|
} else if (count > 0) {
|
|
//项目经理
|
|
//项目经理
|
|
type = 1;
|
|
type = 1;
|
|
- list = projectMapper.selectUserPowerList(userVO,type);
|
|
|
|
|
|
+ list = projectMapper.selectUserPowerList(userVO, type);
|
|
} else {
|
|
} else {
|
|
//普通用户
|
|
//普通用户
|
|
msg.setError("对不起你不具备该项权限!");
|
|
msg.setError("对不起你不具备该项权限!");
|
|
@@ -80,14 +81,30 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
QueryWrapper<Project> qw = new QueryWrapper<>();
|
|
QueryWrapper<Project> qw = new QueryWrapper<>();
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
|
|
- if(user != null){
|
|
|
|
-// Integer count = projectMapper.selectList(qw.eq("manager_id", user.getId()));
|
|
|
|
-// if(){
|
|
|
|
-//
|
|
|
|
-// }
|
|
|
|
- }else{
|
|
|
|
- msg.setError("用户不存或没登录!");
|
|
|
|
|
|
+ if (user != null) {
|
|
|
|
+ Project pro = projectMapper.selectById(userVO.getProjectId());
|
|
|
|
+ if (pro.getCreatorId() == user.getId() || pro.getManagerId() == user.getId()) {
|
|
|
|
+ //资产方管理员或者担任项目经理的人才可修改人员权限
|
|
|
|
+ if (null != userVO.getPowers()) {
|
|
|
|
+ List<Integer> powerTypes = ListUtil.convertIntegerIdsArrayToList(userVO.getPowers());
|
|
|
|
+ if (powerTypes.size() > 0) {
|
|
|
|
+ //删除之前的权限
|
|
|
|
+ powerMapper.delete(new QueryWrapper<Power>().eq("user_id", userVO.getId()).eq("project_id", userVO.getProjectId()));
|
|
|
|
+ }
|
|
|
|
+ for (Integer powerType : powerTypes) {
|
|
|
|
+ Power power = new Power();
|
|
|
|
+ power.setPowerType(powerType);
|
|
|
|
+ power.setProjectId(userVO.getProjectId());
|
|
|
|
+ power.setUserId(userVO.getId());
|
|
|
|
+ powerMapper.insert(power);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ msg.setError("对不起您没有该项权限!");
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ msg.setError("用户不存或没登录!");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- return null;
|
|
|
|
|
|
+ return msg;
|
|
}
|
|
}
|
|
}
|
|
}
|