合同归还0.1

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -178,11 +178,11 @@ public class WorkContractInfoController extends BaseController {
                 }
                 if(user.getRoleList().size()>0){
                     //判断是否为归档员
-                    if ("htgly".equals(user.getRoleList().get(0).getEnname())){
-                        info.setOpinion("1");
-                    }else{
-                        info.setOpinion("0");
-                    }
+//                    if ("htgly".equals(user.getRoleList().get(0).getEnname())){
+//                        info.setOpinion("1");
+//                    }else{
+//                        info.setOpinion("0");
+//                    }
                     //判断是否为admin
                     if (UserUtils.isManager()){
                         info.setFlagAdmin("1");

src/main/webapp/webpage/modules/sys/menuForm.jsp

@@ -53,17 +53,17 @@
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">链接:</label></td>
-		         <td class="width-35" ><form:input path="href" htmlEscape="false" maxlength="2000" class="form-control layui-input required"/>
+		         <td class="width-35" ><form:input path="href" htmlEscape="false" maxlength="2000" class="form-control layui-input"/>
 					<span class="help-inline">点击菜单跳转的页面</span></td>
 		         <td  class="width-15 active"><label class="pull-right">目标:</label></td>
-		         <td  class="width-35" ><form:input path="target" htmlEscape="false" maxlength="10" class="form-control layui-input required"/>
+		         <td  class="width-35" ><form:input path="target" htmlEscape="false" maxlength="10" class="form-control layui-input"/>
 					<span class="help-inline">链接打开的目标窗口，默认：mainFrame</span></td>
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">图标:</label></td>
 		         <td class="width-35" ><sys:iconselect id="icon" name="icon" value="${menu.icon}"/></td>
 		         <td  class="width-15 active"><label class="pull-right">排序:</label></td>
-		         <td  class="width-35" ><form:input path="sort" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+		         <td  class="width-35" ><form:input path="sort" htmlEscape="false" maxlength="50" class="form-control layui-input"/>
 					<span class="help-inline">排列顺序，升序。</span></td>
 		      </tr>
 		      <tr>
@@ -71,12 +71,12 @@
 		         <td class="width-35" ><form:radiobuttons path="isShow" items="${fns:getDictList('show_hide')}" itemLabel="label" itemValue="value" htmlEscape="false" class="required i-checks "/>
 					<span class="help-inline">该菜单或操作是否显示到系统菜单中</span></td>
 		         <td  class="width-15 active"><label class="pull-right">权限标识:</label></td>
-		         <td  class="width-35" ><form:input path="permission" htmlEscape="false" maxlength="100" class="form-control layui-input required"/>
+		         <td  class="width-35" ><form:input path="permission" htmlEscape="false" maxlength="100" class="form-control layui-input"/>
 					<span class="help-inline">控制器中定义的权限标识，如：@RequiresPermissions("权限标识")</span></td>
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">备注:</label></td>
-		         <td class="width-35" ><form:textarea path="remarks" htmlEscape="false" rows="3" class="form-control layui-input required "/></td>
+		         <td class="width-35" ><form:textarea path="remarks" htmlEscape="false" rows="3" class="form-control layui-input "/></td>
 		         <td  class="width-15 active"><label class="pull-right"></label></td>
 		         <td  class="width-35" ></td>
 		      </tr>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -806,16 +806,12 @@
 							<c:when test="${(workContractInfo.borrowStatus == '1' or workContractInfo.borrowStatus == '3' or workContractInfo.borrowStatus == '4')}">,"candeleteBorrow":"1"</c:when>
 						</c:choose>
 					</c:if>
-					<c:if test="${'1' == workContractInfo.opinion}">
-						<c:choose>
-							<c:when test="${workContractInfo.borrowStatus == '5' && workContractInfo.giveStatus != '5'}">,"giveBorrow":"1"</c:when>
-						</c:choose>
-					</c:if>
 					<c:if test="${'1' == workContractInfo.flagAdmin}">
 						<c:choose>
 							<c:when test="${workContractInfo.contractState == 5 }">,"updateAdmin":"1"</c:when>
 						</c:choose>
 					</c:if>
+					<shiro:hasPermission name="workcontractrecord:workContractRecord:revert">,"giveBorrow":	<c:choose><c:when test="${workContractInfo.borrowStatus == '5' && workContractInfo.giveStatus != '5'}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>