|
|
@ -157,7 +157,6 @@ public class ProjectController extends JeecgController<Project, IProjectService> |
|
|
|
Page<Project> page = new Page<Project>(pageNo, pageSize); |
|
|
|
Page<Project> page = new Page<Project>(pageNo, pageSize); |
|
|
|
|
|
|
|
|
|
|
|
//('科技主管部门待提交', '1');
|
|
|
|
//('科技主管部门待提交', '1');
|
|
|
|
//('科技主管部门已提交', '2');
|
|
|
|
|
|
|
|
//('不受理', '3');
|
|
|
|
//('不受理', '3');
|
|
|
|
//('已受理', '4');
|
|
|
|
//('已受理', '4');
|
|
|
|
//('申请人待提交', '5');
|
|
|
|
//('申请人待提交', '5');
|
|
|
@ -170,12 +169,12 @@ public class ProjectController extends JeecgController<Project, IProjectService> |
|
|
|
//申请单位数据
|
|
|
|
//申请单位数据
|
|
|
|
if ("faren_admin".equals(loginUser.getRoleCode())) { |
|
|
|
if ("faren_admin".equals(loginUser.getRoleCode())) { |
|
|
|
queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); |
|
|
|
queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); |
|
|
|
queryWrapper.eq("project_status", 5); |
|
|
|
queryWrapper.eq("project_status", 6); |
|
|
|
} |
|
|
|
} |
|
|
|
// 区/县管理员数据
|
|
|
|
// 区/县管理员数据
|
|
|
|
if ("quxian_admin".equals(loginUser.getRoleCode())) { |
|
|
|
if ("quxian_admin".equals(loginUser.getRoleCode())) { |
|
|
|
queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); |
|
|
|
queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); |
|
|
|
queryWrapper.likeRight("project_status", 6); |
|
|
|
queryWrapper.eq("project_status", 1); |
|
|
|
} |
|
|
|
} |
|
|
|
if ("kejiju_admin".equals(loginUser.getRoleCode())) { |
|
|
|
if ("kejiju_admin".equals(loginUser.getRoleCode())) { |
|
|
|
queryWrapper.in("project_status", 7, 8); |
|
|
|
queryWrapper.in("project_status", 7, 8); |
|
|
|