修改日志级别，增加修复错误时添加的sql备注

fs-company/src/main/java/com/fs/company/controller/qw/QwUserController.java

@@ -70,16 +70,22 @@ import java.util.stream.Collectors;
 public class QwUserController extends BaseController
 {
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(QwUserController.class);
+
     @Autowired
     private IQwUserService qwUserService;
+
     @Autowired
     private TokenService tokenService;
+
     @Autowired
     private ICompanyUserService companyUserService;
+
     @Autowired
     private IQwExternalContactService qwExternalContactService;
+
     @Autowired
     private QwCompanyMapper qwCompanyMapper;
+
     @Autowired
     private QwExternalContactMapper qwExternalContactMapper;
 
@@ -106,16 +112,45 @@ public class QwUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('qw:user:staffList')")
     @GetMapping("/staffList")
-    public TableDataInfo staffList(QwUserListParam qwUser)
-    {
+    public TableDataInfo staffList(QwUserListParam qwUser) {
         startPage();
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         qwUser.setCompanyId(loginUser.getCompany().getCompanyId());
-
         List<QwUserVO> list = qwUserService.selectQwUserListStaffVO(qwUser);
         return getDataTable(list);
     }
 
+    /**
+     * 导出企微员工列表
+     * @param qwUser
+     * @return AjaxResult
+     */
+    @PreAuthorize("@ss.hasPermi('qw:user:export')")
+    @Log(title = "企微员工", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportStaff")
+    public AjaxResult export(QwUserListParam qwUser) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        qwUser.setCompanyId(loginUser.getCompany().getCompanyId());
+        List<QwUserVO> list = qwUserService.selectQwUserListStaffVO(qwUser);
+        ExcelUtil<QwUserVO> util = new ExcelUtil<QwUserVO>(QwUserVO.class);
+        return util.exportExcel(list, "企微员工数据");
+    }
+
+    /**
+     * 导出企微用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:user:export')")
+    @Log(title = "企微用户", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(QwUser qwUser) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        qwUser.setCompanyId(loginUser.getCompany().getCompanyId());
+        List<QwUser> list = qwUserService.selectQwUserList(qwUser);
+        ExcelUtil<QwUser> util = new ExcelUtil<QwUser>(QwUser.class);
+        return util.exportExcel(list, "企微用户数据");
+    }
+
+
     /**
      * 查询我的部门 企业微信员工列表
      */
@@ -433,23 +468,6 @@ public class QwUserController extends BaseController
 //        return getDataTable(list);
 //    }
 
-    /**
-     * 导出企微用户列表
-     */
-    @PreAuthorize("@ss.hasPermi('qw:user:export')")
-    @Log(title = "企微用户", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(QwUser qwUser)
-    {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        qwUser.setCompanyId(loginUser.getCompany().getCompanyId());
-
-        List<QwUser> list = qwUserService.selectQwUserList(qwUser);
-
-        ExcelUtil<QwUser> util = new ExcelUtil<QwUser>(QwUser.class);
-        return util.exportExcel(list, "企微用户数据");
-    }
-
     /**
      * 查询企微用户列表-下拉框
      */

fs-service/src/main/java/com/fs/qw/vo/QwUserVO.java

@@ -11,12 +11,15 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class QwUserVO {
+
+    @Excel(name = "企微成员id")
     private Long id;
 
     /** 企微用户id */
-    @Excel(name = "企微用户id")
+    @Excel(name = "企微账号")
     private String qwUserId;
 
+    @Excel(name = "企微昵称")
     private String qwUserName;
 
     private String department;
@@ -24,6 +27,7 @@ public class QwUserVO {
     private String departmentName;
 
     private String corpName;
+
     /** 公司id */
     @Excel(name = "公司id")
     private Long companyId;
@@ -33,18 +37,20 @@ public class QwUserVO {
     private Long companyUserId;
 
     /** 企微id */
-    @Excel(name = "企微id")
     private String corpId;
+
+    @Excel(name = "授权key")
     private String appKey;
 
-    @Excel(name = "企微")
     private Integer status;
 
-    @Excel(name = "企微")
+    @Excel(name = "员工状态")
     private Integer isDel;
 
     private String nickName;
     private String userName;
+
+    @Excel(name = "员工称呼")
     private String welcomeText;
 
     private Integer isSendMsg;
@@ -56,41 +62,57 @@ public class QwUserVO {
     * 联系我
     */
     private String contactWay;
+
     /**
     * AI客服角色名
     */
+    @Excel(name = "绑定的AI客服")
     private String fastGptRoleName;
 
     /**
     * 登录状态
     */
+    @Excel(name = "ai状态")
     private Integer loginStatus;
+
     private Integer toolStatus;
+
     /**
     * 云主机地址
     */
+    @Excel(name = "服务器地址")
     private String loginCodeUrl;
     /**
      * 插件版本号
      */
     private String version;
 
+    @Excel(name = "vid")
     private String vid;
+
+    @Excel(name = "uid")
     private String uid;
 
     private Integer ipadStatus;
+
+    @Excel(name = "serverId")
     private Long serverId;
+
     private Integer serverStatus;
 
     /**
      * 云主机地址（不包含拼接内容）
      */
     private String loginCodeUrlOriginal;
+
+    @Excel(name = "发送方式")
     private Integer sendMsgType;
+
     private String companyName;
     /**
      * 是否自动发课 00、禁用，01、启用
      */
+    @Excel(name = "自动发课")
     private String isAuto;
 
     private Long doctorId;