luojun 2 سال پیش
والد
کامیت
3d82219b22

+ 11 - 12
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanToRoleController.java

@@ -31,26 +31,25 @@ import com.xunmei.common.core.web.page.TableDataInfo;
  * @author xunmei
  * @date 2023-09-12
  */
-@Api(tags = {"CoreSafecheckPlanToRole" })
+@Api(tags = {"CoreSafecheckPlanToRole"})
 @RestController
 @RequestMapping("/role")
 public class CoreSafecheckPlanToRoleController extends BaseController {
     @Autowired
     private ICoreSafecheckPlanToRoleService coreSafecheckPlanToRoleService;
 
-/**
- * 查询常规安全检查计划执行角色关联列表
- */
-@ApiOperation(value = "查询CoreSafecheckPlanToRole列表")
-@RequiresPermissions("system:role:list")
-@GetMapping("/list")
+    /**
+     * 查询常规安全检查计划执行角色关联列表
+     */
+    @ApiOperation(value = "查询CoreSafecheckPlanToRole列表")
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/list")
     public TableDataInfo<CoreSafecheckPlanToRole> list(CoreSafecheckPlanToRole coreSafecheckPlanToRole) {
 
-        return coreSafecheckPlanToRoleService.selectPage( coreSafecheckPlanToRole);
+        return coreSafecheckPlanToRoleService.selectPage(coreSafecheckPlanToRole);
     }
 
 
-
     /**
      * 获取常规安全检查计划执行角色关联详细信息
      */
@@ -66,7 +65,7 @@ public class CoreSafecheckPlanToRoleController extends BaseController {
      */
     @ApiOperation(value = "新增CoreSafecheckPlanToRole")
     @RequiresPermissions("system:role:add")
-    @Log(title = "常规安全检查计划执行角色关联" , businessType = BusinessType.INSERT)
+    @Log(title = "常规安全检查计划执行角色关联", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreSafecheckPlanToRole coreSafecheckPlanToRole) {
         return toAjax(coreSafecheckPlanToRoleService.insertCoreSafecheckPlanToRole(coreSafecheckPlanToRole));
@@ -77,7 +76,7 @@ public class CoreSafecheckPlanToRoleController extends BaseController {
      */
     @ApiOperation(value = "修改CoreSafecheckPlanToRole")
     @RequiresPermissions("system:role:edit")
-    @Log(title = "常规安全检查计划执行角色关联" , businessType = BusinessType.UPDATE)
+    @Log(title = "常规安全检查计划执行角色关联", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreSafecheckPlanToRole coreSafecheckPlanToRole) {
         return toAjax(coreSafecheckPlanToRoleService.updateCoreSafecheckPlanToRole(coreSafecheckPlanToRole));
@@ -88,7 +87,7 @@ public class CoreSafecheckPlanToRoleController extends BaseController {
      */
     @ApiOperation(value = "删除CoreSafecheckPlanToRole")
     @RequiresPermissions("system:role:remove")
-    @Log(title = "常规安全检查计划执行角色关联" , businessType = BusinessType.DELETE)
+    @Log(title = "常规安全检查计划执行角色关联", businessType = BusinessType.DELETE)
     @DeleteMapping("/{planIds}")
     public AjaxResult remove(@PathVariable Long[] planIds) {
         return toAjax(coreSafecheckPlanToRoleService.deleteCoreSafecheckPlanToRoleByPlanIds(planIds));

+ 1 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -563,7 +563,7 @@ public class SysUserController extends BaseController {
     /**
      * 导入
      */
-    @RequiresPermissions("system:user:importData")
+    @RequiresPermissions("system:user:import")
     @ResponseBody
     @PostMapping("/importData")
     @Transactional(rollbackFor = {RuntimeException.class, Exception.class})