|
@@ -5,6 +5,8 @@ import cn.com.ctop.common.module.entity.SysUser;
|
|
import cn.com.ctop.common.module.service.IProjectService;
|
|
import cn.com.ctop.common.module.service.IProjectService;
|
|
import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
|
|
+import cn.com.ctop.common.module.utils.ResultMapUtils;
|
|
|
|
+import cn.com.ctop.common.module.utils.StatusCode;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -120,10 +122,32 @@ public class ProjectMemberController {
|
|
map.put("success", false);
|
|
map.put("success", false);
|
|
map.put("code", -1);
|
|
map.put("code", -1);
|
|
}
|
|
}
|
|
-
|
|
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @GetMapping("/projectList")
|
|
|
|
+ public Map<String,Object>projectList(){
|
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
|
+ try {
|
|
|
|
+ String userId = ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
|
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
|
+ if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
|
|
|
|
+ List<Project>projects = projectService.list();
|
|
|
|
+ result.put("data",projects);
|
|
|
|
+ ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ List<Project> projects = projectMemberService.selectListByUserId(userId);
|
|
|
|
+ result.put("data",projects);
|
|
|
|
+ ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
|
|
|
|
+ return result;
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ ResultMapUtils.setResultMap(result,StatusCode.COMMON_PARAM_ERROR);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
@GetMapping(value = "/participateListV2")
|
|
@GetMapping(value = "/participateListV2")
|
|
public Result<IPage<ProjectMember>> participateListV2(ProjectMember projectMember,
|
|
public Result<IPage<ProjectMember>> participateListV2(ProjectMember projectMember,
|