路由冲突修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PoUserController.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  * @date 2023-01-17
  */
 @RestController
-@RequestMapping("/system/user")
+@RequestMapping("/system/users")
 public class PoUserController extends BaseController
 {
     @Autowired
@@ -42,7 +42,7 @@ public class PoUserController extends BaseController
      * 查询用户列表
      */
     @ApiOperation("查询用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @PreAuthorize("@ss.hasPermi('system:users:list')")
     @GetMapping("/list")
     public TableDataInfo list(PoUser poUser)
     {
@@ -55,7 +55,7 @@ public class PoUserController extends BaseController
      * 导出用户列表
      */
     @ApiOperation("导出用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @PreAuthorize("@ss.hasPermi('system:users:export')")
     @Log(title = "被分配权限的用户", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PoUser poUser)
@@ -69,7 +69,7 @@ public class PoUserController extends BaseController
      * 根据用户编号获取详细信息
      */
     @ApiOperation("根据用户编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @PreAuthorize("@ss.hasPermi('system:users:query')")
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
@@ -87,7 +87,7 @@ public class PoUserController extends BaseController
      * 新增分配权限用户
      */
     @ApiOperation("新增用户")
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @PreAuthorize("@ss.hasPermi('system:users:add')")
     @Log(title = "获得权限用户", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@Validated  @RequestBody PoUser poUser)
@@ -108,7 +108,7 @@ public class PoUserController extends BaseController
      * 修改用户
      */
     @ApiOperation("修改用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @PreAuthorize("@ss.hasPermi('system:users:edit')")
     @Log(title = "修改权限用户", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     public AjaxResult edit( @Validated @RequestBody PoUser poUser)
@@ -138,7 +138,7 @@ public class PoUserController extends BaseController
      * 删除用户
      */
     @ApiOperation("删除用户")
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @PreAuthorize("@ss.hasPermi('system:users:remove')")
     @Log(title = "删除权限用户", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds)
@@ -154,7 +154,7 @@ public class PoUserController extends BaseController
      * 重置密码
      */
     @ApiOperation("重置密码")
-    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @PreAuthorize("@ss.hasPermi('system:users:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody PoUser poUser)
@@ -171,7 +171,7 @@ public class PoUserController extends BaseController
      * 状态修改
      */
     @ApiOperation("状态修改")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @PreAuthorize("@ss.hasPermi('system:users:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody PoUser poUser)

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PoNewsServiceImpl.java

@@ -13,7 +13,6 @@ import com.ruoyi.system.mapper.PoUserMapper;
 import com.ruoyi.system.service.IPoNewsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.Validator;
 import java.util.ArrayList;
@@ -34,8 +33,6 @@ public class PoNewsServiceImpl implements IPoNewsService {
     @Autowired
     protected Validator validator;
 
-    @Autowired
-    private PoUserServiceImpl poUserService;
 
     /**
      * 根据Id查询