Merge branch 'pre' into 'master'

删除权限

See merge request !162

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/slime/SlimeFieldAppliesController.java

@@ -38,7 +38,6 @@ public class SlimeFieldAppliesController extends BaseController {
     ISlimeFieldAppliesAdminService slimeFieldAppliesAdminService;
 
 
-    @RequiresPermissions("slime:field:apply:view")
     @GetMapping()
     public String applyList() {
         return prefix + "/applyList";
@@ -46,7 +45,7 @@ public class SlimeFieldAppliesController extends BaseController {
 
 
     @Log(title = "场地申请列表", businessType = BusinessType.LIST)
-    @RequiresPermissions("slime:field:apply:list")
+    @RequiresPermissions("slime:field:apply")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(SlimeFieldApplyListParam param) {
@@ -65,7 +64,7 @@ public class SlimeFieldAppliesController extends BaseController {
     }
 
     @Log(title = "场地申请详情", businessType = BusinessType.DETAIL)
-    @RequiresPermissions("slime:field:apply:detail")
+    @RequiresPermissions("slime:field:apply")
     @GetMapping("/details/{fieldApplyId}")
     public String detail(@PathVariable("fieldApplyId") String fieldApplyId, ModelMap mmap) {
 
@@ -92,7 +91,7 @@ public class SlimeFieldAppliesController extends BaseController {
 
     @ApiOperation(value = "审核通过")
     @Log(title = "场地申请审核通过", businessType = BusinessType.INSERT)
-    @RequiresPermissions("slime:field:apply:approve")
+    @RequiresPermissions("slime:field:apply")
     @PostMapping("/approve")
     @ResponseBody
     public AjaxResult approve(@RequestParam(required = true) String fieldApplyId) {
@@ -104,7 +103,7 @@ public class SlimeFieldAppliesController extends BaseController {
 
     @ApiOperation(value = "审核驳回")
     @Log(title = "场地申请审核驳回", businessType = BusinessType.INSERT)
-    @RequiresPermissions("slime:field:apply:reject")
+    @RequiresPermissions("slime:field:apply")
     @PostMapping("/reject")
     @ResponseBody
     public AjaxResult reject(@RequestParam(required = true) String fieldApplyId,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/slime/SlimeFieldsController.java

@@ -38,7 +38,6 @@ public class SlimeFieldsController extends BaseController {
     ISlimeCompaniesAdminService slimeCompaniesAdminService;
 
 
-    @RequiresPermissions("slime:field:view")
     @GetMapping()
     public String list() {
         return prefix + "/list";
@@ -46,7 +45,7 @@ public class SlimeFieldsController extends BaseController {
 
 
     @Log(title = "场地列表", businessType = BusinessType.LIST)
-    @RequiresPermissions("slime:field:list")
+    @RequiresPermissions("slime:field")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(SlimeFieldListParam param) {
@@ -65,7 +64,7 @@ public class SlimeFieldsController extends BaseController {
     }
 
     @Log(title = "场地详情", businessType = BusinessType.DETAIL)
-    @RequiresPermissions("slime:field:detail")
+    @RequiresPermissions("slime:field")
     @GetMapping("/details/{fieldId}")
     public String detail(@PathVariable("fieldId") String fieldId, ModelMap mmap) {
 
@@ -92,7 +91,7 @@ public class SlimeFieldsController extends BaseController {
 
     @ApiOperation(value = "场地编辑")
     @Log(title = "场地编辑", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("slime:field:edit")
+    @RequiresPermissions("slime:field")
     @PostMapping("edit")
     @ResponseBody
     public AjaxResult edit(@RequestBody @Validated SlimeFieldEditParam parameter) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/slime/SlimeSponsorAppliesController.java

@@ -30,14 +30,13 @@ public class SlimeSponsorAppliesController extends BaseController {
     @Autowired
     ISlimeSponsorAppliesAdminService slimeSponsorAppliesAdminService;
 
-    @RequiresPermissions("slime:sponsor:apply:view")
     @GetMapping()
     public String applyList() {
         return prefix + "/applyList";
     }
 
     @Log(title = "主办申请管理", businessType = BusinessType.LIST)
-    @RequiresPermissions("slime:sponsor:apply:list")
+    @RequiresPermissions("slime:sponsor:apply")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(SlimeSponsorApplyListParam param) {
@@ -55,7 +54,7 @@ public class SlimeSponsorAppliesController extends BaseController {
     }
 
     @Log(title = "主办申请管理", businessType = BusinessType.DETAIL)
-    @RequiresPermissions("slime:sponsor:apply:detail")
+    @RequiresPermissions("slime:sponsor:apply")
     @GetMapping(value = "/details/{sponsorApplyId}")
     public String detail(@PathVariable("sponsorApplyId") String sponsorApplyId, ModelMap mmap) {
 
@@ -73,7 +72,7 @@ public class SlimeSponsorAppliesController extends BaseController {
 
     @ApiOperation(value = "审核通过")
     @Log(title = "主办申请审核通过", businessType = BusinessType.INSERT)
-    @RequiresPermissions("slime:sponsor:apply:approve")
+    @RequiresPermissions("slime:sponsor:apply")
     @PostMapping("/approve")
     @ResponseBody
     public AjaxResult approve(@RequestParam(required = true) String sponsorApplyId) {
@@ -85,7 +84,7 @@ public class SlimeSponsorAppliesController extends BaseController {
 
     @ApiOperation(value = "审核驳回")
     @Log(title = "主办申请审核驳回", businessType = BusinessType.INSERT)
-    @RequiresPermissions("slime:sponsor:apply:reject")
+    @RequiresPermissions("slime:sponsor:apply")
     @PostMapping("/reject")
     @ResponseBody
     public AjaxResult reject(@RequestParam(required = true) String sponsorApplyId,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/slime/SlimeSponsorsController.java

@@ -32,7 +32,6 @@ public class SlimeSponsorsController extends BaseController {
     ISlimeSponsorsAdminService slimeSponsorsAdminService;
 
 
-    @RequiresPermissions("slime:sponsor:view")
     @GetMapping()
     public String list() {
         return prefix + "/list";
@@ -40,7 +39,7 @@ public class SlimeSponsorsController extends BaseController {
 
 
     @Log(title = "主办列表", businessType = BusinessType.LIST)
-    @RequiresPermissions("slime:sponsor:list")
+    @RequiresPermissions("slime:sponsor")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(SlimeSponsorListParam param) {
@@ -58,7 +57,7 @@ public class SlimeSponsorsController extends BaseController {
     }
 
     @Log(title = "主办详情", businessType = BusinessType.DETAIL)
-    @RequiresPermissions("slime:sponsor:detail")
+    @RequiresPermissions("slime:sponsor")
     @GetMapping(value = "/details/{sponsorId}")
     public String detail(@PathVariable("sponsorId") String sponsorId, ModelMap mmap) {
 
@@ -76,7 +75,7 @@ public class SlimeSponsorsController extends BaseController {
 
     @ApiOperation(value = "主办编辑")
     @Log(title = "主办编辑", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("slime:sponsor:edit")
+    @RequiresPermissions("slime:sponsor")
     @PostMapping("edit")
     @ResponseBody
     public AjaxResult edit(@RequestBody @Validated SlimeSponsorEditParam parameter) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/field/applyList.html

@@ -47,7 +47,7 @@
     var dicFieldApplyType = [[${@dict.getType('zhengzai_field_apply_type')}]];
     var dicFieldApplyStatus = [[${@dict.getType('zhengzai_field_apply_status')}]];
 
-    var detailFlag = [[${@permission.hasPermi('slime:field:apply:detail')}]];
+    // var detailFlag = [[${@permission.hasPermi('slime:field:apply:detail')}]];
 
     var prefix = ctx + "slime/field/apply";
 
@@ -100,7 +100,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.fieldApplyId + '\')"></i>查看</a> ');
+                        actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.fieldApplyId + '\')"></i>查看</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/field/list.html

@@ -46,7 +46,6 @@
 <script th:inline="javascript">
     var dicFieldIsOnline = [[${@dict.getType('zhengzai_field_is_online')}]];
     var dicFieldClaimStatus = [[${@dict.getType('zhengzai_field_claim_status')}]];
-
     var detailFlag = [[${@permission.hasPermi('slime:field:detail')}]];
 
     var prefix = ctx + "slime/field";
@@ -97,7 +96,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.fieldId + '\')"></i>查看</a> ');
+                        actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.fieldId + '\')"></i>查看</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/sponsor/applyList.html

@@ -39,7 +39,7 @@
 <script th:inline="javascript">
     var dicSponsorApplyStatus = [[${@dict.getType('zhengzai_sponsor_apply_status')}]];
 
-    var detailFlag = [[${@permission.hasPermi('slime:sponsor:apply:detail')}]];
+    // var detailFlag = [[${@permission.hasPermi('slime:sponsor:apply:detail')}]];
 
     var prefix = ctx + "slime/sponsor/apply";
 
@@ -81,7 +81,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.sponsorApplyId + '\')"></i>查看</a> ');
+                        actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.sponsorApplyId + '\')"></i>查看</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/sponsor/list.html

@@ -40,7 +40,7 @@
 <script th:inline="javascript">
     var dicSponsorIsOnline = [[${@dict.getType('zhengzai_sponsor_is_online')}]];
 
-    var detailFlag = [[${@permission.hasPermi('slime:sponsor:detail')}]];
+    // var detailFlag = [[${@permission.hasPermi('slime:sponsor:detail')}]];
 
     var prefix = ctx + "slime/sponsor";
 
@@ -83,7 +83,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.sponsorId + '\')"></i>查看</a> ');
+                        actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.sponsorId + '\')"></i>查看</a> ');
                         return actions.join('');
                     }
                 }]