解决合同备注字符受限制问题和用印申请驳回无法修改问题

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsUserController.java

@@ -81,7 +81,9 @@ public class ProjectRecordsUserController extends BaseController {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			//设置合同信息
 			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
-			workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()), "construction_project_type", ""));
+			if (null != workContractInfo){
+				workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()), "construction_project_type", ""));
+			}
 			projectRecords.setWorkContractInfo(workContractInfo);
 			//设置项目组成员
 			projectRecordsService.queryUserNames(projectRecords);

src/main/webapp/webpage/modules/workadministrativeatamp/workAdministrativeAtampList.jsp

@@ -307,7 +307,7 @@
                                 xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改用印申请', '${ctx}/workadministrativeatamp/workAdministrativeAtamp/form?id=" + d.id+"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i>修改</a>"
                             }
                             if(d.canmodify != undefined && d.canmodify =="1"){
-                                xml+="<a href=\"#\" onclick=\"openDialogre('修改用印申请', '${ctx}/workadministrativeatamp/workAdministrativeAtamp/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                                xml+="<a href=\"#\" onclick=\"openDialogre('修改用印申请', '${ctx}/workadministrativeatamp/workAdministrativeAtamp/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                             }
                             if(d.canrecall != undefined && d.canrecall =="1"){
                                 xml+="<a href=\"#\" onclick=\"openDialogre('修改用印申请', '${ctx}/workadministrativeatamp/workAdministrativeAtamp/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";

src/main/webapp/webpage/modules/workcontractre/workContractReAudit.jsp

@@ -765,7 +765,7 @@
 							<div class="layui-item layui-col-xs12 with-textarea" >
 								<label class="layui-form-label">审批意见：</label>
 								<div class="layui-input-block">
-									<form:textarea path="act.comment" class="form-control" rows="4" maxlength="127" />
+									<form:textarea path="act.comment" class="form-control" rows="4" maxlength="780" />
 								</div>
 							</div>
 						</div>