优化 个人信息编辑调整 权限去掉

slibra-admin/src/main/java/com/slibra/web/controller/business/TXinyiFeedbackController.java

@@ -37,7 +37,7 @@ public class TXinyiFeedbackController extends BaseController
     /**
      * 查询信义意见反馈列表
      */
-    @PreAuthorize("@ss.hasPermi('business:feedback:list')")
+//    @PreAuthorize("@ss.hasPermi('business:feedback:list')")
     @GetMapping("/list")
     public TableDataInfo list(TXinyiFeedback tXinyiFeedback)
     {
@@ -49,7 +49,7 @@ public class TXinyiFeedbackController extends BaseController
     /**
      * 导出信义意见反馈列表
      */
-    @PreAuthorize("@ss.hasPermi('business:feedback:export')")
+//    @PreAuthorize("@ss.hasPermi('business:feedback:export')")
     @Log(title = "信义意见反馈", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TXinyiFeedback tXinyiFeedback)
@@ -62,7 +62,7 @@ public class TXinyiFeedbackController extends BaseController
     /**
      * 获取信义意见反馈详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:feedback:query')")
+//    @PreAuthorize("@ss.hasPermi('business:feedback:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +72,7 @@ public class TXinyiFeedbackController extends BaseController
     /**
      * 新增信义意见反馈
      */
-    @PreAuthorize("@ss.hasPermi('business:feedback:add')")
+//    @PreAuthorize("@ss.hasPermi('business:feedback:add')")
     @Log(title = "信义意见反馈", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TXinyiFeedback tXinyiFeedback)
@@ -84,7 +84,7 @@ public class TXinyiFeedbackController extends BaseController
     /**
      * 修改信义意见反馈
      */
-    @PreAuthorize("@ss.hasPermi('business:feedback:edit')")
+//    @PreAuthorize("@ss.hasPermi('business:feedback:edit')")
     @Log(title = "信义意见反馈", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TXinyiFeedback tXinyiFeedback)
@@ -96,7 +96,7 @@ public class TXinyiFeedbackController extends BaseController
     /**
      * 删除信义意见反馈
      */
-    @PreAuthorize("@ss.hasPermi('business:feedback:remove')")
+//    @PreAuthorize("@ss.hasPermi('business:feedback:remove')")
     @Log(title = "信义意见反馈", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

slibra-admin/src/main/java/com/slibra/web/controller/system/SysProfileController.java

@@ -61,10 +61,21 @@ public class SysProfileController extends BaseController
     {
         LoginUser loginUser = getLoginUser();
         SysUser currentUser = loginUser.getUser();
-        currentUser.setNickName(user.getNickName());
+        currentUser.setAvatar(user.getAvatar());//头像
+        currentUser.setUserName(user.getUserName());//登录账号
+
         currentUser.setEmail(user.getEmail());
-        currentUser.setPhonenumber(user.getPhonenumber());
+        currentUser.setPhonenumber(user.getPhonenumber());//手机号
+        currentUser.setNickName(user.getNickName());//姓名
+        currentUser.setPosition(user.getPosition());//职位
+        currentUser.setDeptId(user.getDeptId());//部门（水厂）
+        currentUser.setEmergencyPhone(user.getEmergencyPhone());//接受报警手机号
+
         currentUser.setSex(user.getSex());
+        if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(currentUser))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+        }
         if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
         {
             return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");