修改员工管理-企微员工-员工状态查询条件问题

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

@@ -149,13 +149,14 @@ public interface QwUserMapper extends BaseMapper<QwUser>
             "LEFT JOIN company_user cu ON cu.user_id=qu.company_user_id " +
             "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.is_del=0 and qu.company_user_id is not null "+
+            "where qu.company_user_id is not null "+
             "            <if test=\"qwUserId != null  and qwUserId != ''\"> and qu.qw_user_id = #{qwUserId}</if>\n" +
             "            <if test=\"appKey != null  and appKey != ''\"> and qu.app_key = #{appKey}</if>\n" +
             "            <if test=\"nickName != null  and nickName != ''\"> and cu.nick_name like concat( #{nickName}, '%') </if>\n" +
             "            <if test=\"qwUserName != null  and qwUserName != ''\"> and qu.qw_user_name like concat('%', #{qwUserName}, '%') </if> " +
             "            <if test=\"corpId != null \"> and qu.corp_id = #{corpId}</if>\n" +
             "            <if test=\"companyId != null \"> and qu.company_id = #{companyId}</if>\n " +
+            "            <if test=\"isDel != null \"> and qu.is_del = #{isDel}</if>\n "+
             "            <if test=\"cuDeptIdList != null and !cuDeptIdList.isEmpty() and  userType != '00' \">" +
             "               AND cu.dept_id IN " +
             "                   <foreach collection='cuDeptIdList' item='item' open='(' separator=',' close=')'> " +

fs-service/src/main/java/com/fs/qw/param/QwUserListParam.java

@@ -13,6 +13,7 @@ public class QwUserListParam {
     @Excel(name = "企微用户id")
     private String qwUserId;
 
+    @Excel(name = "企微用户昵称")
     private String qwUserName;
 
     private List<String> qwUserIds;
@@ -36,7 +37,7 @@ public class QwUserListParam {
     @Excel(name = "企微")
     private Integer status;
 
-    @Excel(name = "企微")
+    @Excel(name = "员工状态")
     private Integer isDel;
 
     private String nickName;

fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -904,8 +904,6 @@ public class QwUserServiceImpl implements IQwUserService
         return qwUserMapper.updateQwUser(qwUser);
     }
 
-
-
     @Override
     public List<QwUserVO> selectQwUserListVO(QwUserListParam qwUser) {
         return qwUserMapper.selectQwUserListVO(qwUser);
@@ -913,6 +911,7 @@ public class QwUserServiceImpl implements IQwUserService
 
     @Override
     public List<QwUserVO> selectQwUserListStaffVO(QwUserListParam qwUser) {
+        //isDel = 0用来表示员工在职，离职不确定是1还是2，前端这里传递的是2查询。但删除可能是1
         return qwUserMapper.selectQwUserListStaffVO(qwUser);
     }