git-svn-id: https://192.168.57.71/svn/jsgkj@1343 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtj.jsp

@@ -72,12 +72,16 @@
 					   </tr>
 	                <tr>
 	                        <td class="right" colspan="6">
-		                       	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtj.main.search()">
-							   		<i class="glyphicon glyphicon-search"></i>查询
-						   		</a>
-							   	<a class="btn btn-default btn-sm" href="#"  onclick="hxhbtj.main.add()">
-						   			<i class="glyphicon glyphicon-plus"></i>新增
-						   		</a>
+		                        <authz:hasPermission name="${appName}:hxhbtj:main">
+			                       	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtj.main.search()">
+								   		<i class="glyphicon glyphicon-search"></i>查询
+							   		</a>
+							   	</authz:hasPermission>
+							   	<authz:hasPermission name="${appName}:hxhbtj:add">
+								   	<a class="btn btn-default btn-sm" href="#"  onclick="hxhbtj.main.add()">
+							   			<i class="glyphicon glyphicon-plus"></i>新增
+							   		</a>
+						   		</authz:hasPermission>
 	                        </td>
 	                    </tr>
                     </table>
@@ -103,16 +107,22 @@
 								<td >${list.tbzzs }</td>
 								<td >${list.rq }</td>
 						        <td class="operatetd">
-							        <a class="btn btn-default btn-xs" href="#" onclick="hxhbtj.main.view('${list.id}')" title="查看">
-							            <i class="glyphicon glyphicon-search"></i>
-							        </a>
+							        <authz:hasPermission name="${appName}:hxhbtj:main">
+								        <a class="btn btn-default btn-xs" href="#" onclick="hxhbtj.main.view('${list.id}')" title="查看">
+								            <i class="glyphicon glyphicon-search"></i>
+								        </a>
+							        </authz:hasPermission>
 							        <c:if test="${list.recordStatus == 1 }">
-										<a class="btn btn-default btn-xs" href="#"  onclick="hxhbtj.main.edit('${list.id}')" title="编辑">
-									   		<i class="glyphicon glyphicon-pencil"></i>
-									   	</a>
-									    <a class="btn btn-default btn-xs" href="#" onclick="hxhbtj.main.del('${list.id}')" title="删除">
-									   		<i class="glyphicon glyphicon-trash"></i>
-									   	</a>
+								        <authz:hasPermission name="${appName}:hxhbtj:edit">
+											<a class="btn btn-default btn-xs" href="#"  onclick="hxhbtj.main.edit('${list.id}')" title="编辑">
+										   		<i class="glyphicon glyphicon-pencil"></i>
+										   	</a>
+									   	</authz:hasPermission>
+									   	<authz:hasPermission name="${appName}:hxhbtj:delete">
+										    <a class="btn btn-default btn-xs" href="#" onclick="hxhbtj.main.del('${list.id}')" title="删除">
+										   		<i class="glyphicon glyphicon-trash"></i>
+										   	</a>
+									   	</authz:hasPermission>
 								   	</c:if>
 						        </td>
 						    </tr>

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/ctl/HxhbtjCtl.java

@@ -30,6 +30,7 @@ import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkyxtjyfx.hxhbtj.entity.HxhbtjEntity;
 import com.xt.jygl.gkyxtjyfx.hxhbtj.service.HxhbtjService;
 import com.xt.jygl.gkyxtjyfx.hxhbtj.vo.HxhbtjVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -55,7 +56,7 @@ public class HxhbtjCtl extends BaseWebCtl {
 
 //	@SuppressWarnings("unused")
 	@RequestMapping(value = "/main")
-//	@RequiresPermissions("hxhbtj:main")
+	@RequiresPermissions("hxhbtj:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String rq, final String szgkid, final String menuid) throws JsonProcessingException {
 		// 查询条件
 		Specification<HxhbtjEntity> spec = new Specification<HxhbtjEntity>() {
@@ -103,7 +104,7 @@ public class HxhbtjCtl extends BaseWebCtl {
 	}
 	
 	@RequestMapping(value = "/delete")
-//	@RequiresPermissions("hxhbtj:delete")
+	@RequiresPermissions("hxhbtj:delete")
 	@ResponseBody
 	public WebJsonResult delete(Model model, String id) {
 		WebJsonResult wr = success();
@@ -118,7 +119,6 @@ public class HxhbtjCtl extends BaseWebCtl {
 	}
 	
 	@RequestMapping(value = "/view")
-//	@RequiresPermissions("hxhbtj:main")
 	public String view(Model model, String id, String menuid) {
 		HxhbtjEntity entity = hxhbtjService.findOne(id);
 		HxhbtjVo vo = new HxhbtjVo();
@@ -179,7 +179,7 @@ public class HxhbtjCtl extends BaseWebCtl {
 	
 	
 	@RequestMapping(value = "/add")
-//	@RequiresPermissions("hxhbtj:add")
+	@RequiresPermissions("hxhbtj:add")
 	public String add(Model model, String menuid, String path) {
 		if (!StringUtils.isEmpty(path)) {
 			path = path.replace(":", "&");
@@ -199,7 +199,7 @@ public class HxhbtjCtl extends BaseWebCtl {
 	}
 	
 	@RequestMapping(value = "/edit")
-//	@RequiresPermissions("hxhbtj:edit")
+	@RequiresPermissions("hxhbtj:edit")
 	public String edit(Model model, String id, String path) {
 		if (!StringUtils.isEmpty(path)) {
 			path = path.replace(":", "&");