项目类型附件库修改

src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryRelationController.java

@@ -7,6 +7,7 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
+import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.sys.dao.MainDictDetailDao;
@@ -98,7 +99,10 @@ public class ProjectAccessoryRelationController extends BaseController {
 	public String form(ProjectAccessoryRelationInfo projectAccessoryRelationInfo, Model model) {
 		//修改
 		if(StringUtils.isNotBlank(projectAccessoryRelationInfo.getId())){
-			projectAccessoryRelationInfo.setProjectTemplateList(projectTemplateService.getProjectTemplateListById(projectAccessoryRelationInfo.getAttachType(), projectAccessoryRelationInfo.getProjectType(),projectAccessoryRelationInfo.getId()));
+			List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateListByForm(projectAccessoryRelationInfo);
+			ProjectTemplateInfo info = projectTemplateService.get(projectAccessoryRelationInfo.getAttachId());
+			projectTemplateList.add(info);
+			projectAccessoryRelationInfo.setProjectTemplateList(projectTemplateList);
 
 		} else if(StringUtils.isNotBlank(projectAccessoryRelationInfo.getParentIds())) {
 			//新增

src/main/webapp/webpage/modules/projectAccessory/projectTemplate/projectTemplateList.jsp

@@ -95,15 +95,15 @@
 								<td class="op-td text-center">
 									<div class="op-btn-box">
 										<c:if test="${projectAccessory.grade == 0}">
-											<shiro:hasPermission name="projectAccessory:projectAccessory:add">
+											<shiro:hasPermission name="projectTemplate:projectTemplate:add">
 												<a href="javascript:void(0);" onclick="openDialog('添加附件结构', '${ctx}/projectTemplate/projectTemplate/form?parent.id=${projectAccessory.id}','80%','80%')" class="op-btn op-btn-add"><i class="fa fa-plus"></i> 添加下级结构</a>
 											</shiro:hasPermission>
 										</c:if>
 										<c:if test="${projectAccessory.grade ==1}">
-										<shiro:hasPermission name="projectAccessory:projectAccessory:edit">
+										<shiro:hasPermission name="projectTemplate:projectTemplate:edit">
 											<a href="javascript:void(0);" onclick="openDialog('修改附件结构', '${ctx}/projectTemplate/projectTemplate/form?id=${projectAccessory.id}','80%','80%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
 										</shiro:hasPermission>
-										<shiro:hasPermission name="projectAccessory:projectAccessory:del">
+										<shiro:hasPermission name="projectTemplate:projectTemplate:del">
 											<a href="${ctx}/projectTemplate/projectTemplate/delete?id=${projectAccessory.id}" onclick="return confirmx('确认要删除该复附件结构及其子附件结构吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
 										</shiro:hasPermission>
 										</c:if>