今正功能优化

fs-company/src/main/java/com/fs/company/controller/company/CompanyUserController.java

@@ -135,6 +135,7 @@ public class CompanyUserController extends BaseController {
     /**
      * 获取用户列表
      */
+    @PreAuthorize("@ss.hasPermi('company:user:deptList')")
     @GetMapping("/deptList")
     public TableDataInfo deptList(CompanyUser user)
     {
@@ -160,7 +161,6 @@ public class CompanyUserController extends BaseController {
         return getDataTable(list);
     }
 
-
     @GetMapping("/getUserList")
     public R getUserList()
     {
@@ -451,7 +451,7 @@ public class CompanyUserController extends BaseController {
     /**
      * 重置密码
      */
-    @PreAuthorize("@ss.hasPermi('company:user:edit')")
+    @PreAuthorize("@ss.hasPermi('company:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody CompanyUser user)

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -151,6 +151,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
             "RIGHT JOIN qw_dept qd on qu.department=qd.dept_id and qd.corp_id=qu.corp_id " +
             "left join fastgpt_role fr on fr.role_id=qu.fastGpt_role_id " +
             "where qu.company_user_id is not null "+
+            "            <if test=\"id != null  and id != ''\"> and qu.id = #{id}</if>\n" +
             "            <if test=\"qwUserId != null  and qwUserId != ''\"> and qu.qw_user_id = #{qwUserId}</if>\n" +
             "            <if test=\"loginStatus != null \"> and qu.ipad_status = #{loginStatus}</if>\n" +
             "            <if test=\"appKey != null  and appKey != ''\"> and qu.app_key = #{appKey}</if>\n" +