|
@@ -192,7 +192,7 @@ public class ProjectController extends BaseController {
|
|
@RequiresPermissions(value={"sg:managementcenter:project:view","sg:managementcenter:project:add","sg:managementcenter:project:edit"},logical= Logical.OR)
|
|
@RequiresPermissions(value={"sg:managementcenter:project:view","sg:managementcenter:project:add","sg:managementcenter:project:edit"},logical= Logical.OR)
|
|
@RequestMapping(value = "form")
|
|
@RequestMapping(value = "form")
|
|
public String form(Project project, Model model) {
|
|
public String form(Project project, Model model) {
|
|
- String powerScope = project.getPowerScope();
|
|
|
|
|
|
+ /*String powerScope = project.getPowerScope();
|
|
if (null != powerScope) {
|
|
if (null != powerScope) {
|
|
List<String> newList = new ArrayList<>();
|
|
List<String> newList = new ArrayList<>();
|
|
String[] split = powerScope.split(";");
|
|
String[] split = powerScope.split(";");
|
|
@@ -200,7 +200,7 @@ public class ProjectController extends BaseController {
|
|
newList.add(split[i]);
|
|
newList.add(split[i]);
|
|
}
|
|
}
|
|
project.setPowerScopeList(newList);
|
|
project.setPowerScopeList(newList);
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
model.addAttribute("project", project);
|
|
model.addAttribute("project", project);
|
|
if (null != project.getId()){
|
|
if (null != project.getId()){
|
|
if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
|
|
if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
|
|
@@ -236,12 +236,12 @@ public class ProjectController extends BaseController {
|
|
}
|
|
}
|
|
List<String> users = projectService.findAllUser();
|
|
List<String> users = projectService.findAllUser();
|
|
List<Project> arrayLists = new ArrayList<Project>();
|
|
List<Project> arrayLists = new ArrayList<Project>();
|
|
- List<String> powerScopeList = project.getPowerScopeList();
|
|
|
|
|
|
+ /*List<String> powerScopeList = project.getPowerScopeList();
|
|
String b = "";
|
|
String b = "";
|
|
for (String a : powerScopeList) {
|
|
for (String a : powerScopeList) {
|
|
b += a + ";";
|
|
b += a + ";";
|
|
}
|
|
}
|
|
- project.setPowerScope(b);
|
|
|
|
|
|
+ project.setPowerScope(b);*/
|
|
arrayLists.add(project);
|
|
arrayLists.add(project);
|
|
String judgeValue = ProExcelInfo.getJudgeValue(arrayLists,users);
|
|
String judgeValue = ProExcelInfo.getJudgeValue(arrayLists,users);
|
|
if (!"".equals(judgeValue)){
|
|
if (!"".equals(judgeValue)){
|