Revert "渠道活码新增员工组织"

This reverts commit b5ea37803883a63a7f10f0f5d683494b717c3856.

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

@@ -28,7 +28,6 @@ import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwExternalContact;
 import com.fs.qw.domain.QwUser;
-import com.fs.qw.domain.QwUserGroup;
 import com.fs.qw.mapper.QwCompanyMapper;
 import com.fs.qw.mapper.QwExternalContactMapper;
 import com.fs.qw.param.*;
@@ -953,11 +952,4 @@ public class QwUserController extends BaseController
         List<QwUserVO> list = qwUserService.selectQwUserListByCompanyIdAndCorpIdAndNickName(companyId, corpId, nickName);
         return getDataTable(list);
     }
-
-    @PostMapping("/addQwUserGroup")
-    public R addQwUserGroup(@RequestBody QwUserGroup qwUserGroup){
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        qwUserGroup.setCompanyId(loginUser.getCompany().getCompanyId());
-        return qwUserService.addQwUserGroup(qwUserGroup);
-    }
 }

fs-service/src/main/java/com/fs/qw/domain/QwUserGroup.java

@@ -1,50 +0,0 @@
-package com.fs.qw.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
-* <p>
-* qw_user_group 实体类
-* </p>
-*
-* @since 2025-12-29 13:18:32
-*/
-@Getter
-@Setter
-@TableName("qw_user_group")
-public class QwUserGroup implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * id
-    */
-    @TableId
-    private Long groupId;
-
-    /**
-    * 员工组名称
-    */
-    private String groupName;
-
-    /**
-    * 公司id
-    */
-    private Long companyId;
-
-    /**
-    * qw_user的主键id (多个id用;分割)
-    */
-    private String qwUserId;
-
-    private LocalDateTime createTime;
-
-    private LocalDateTime updateTime;
-
-
-}

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

@@ -3,7 +3,6 @@ package com.fs.qw.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.course.param.FsCourseListBySidebarParam;
 import com.fs.qw.domain.QwUser;
-import com.fs.qw.domain.QwUserGroup;
 import com.fs.qw.domain.QwWorkTask;
 import com.fs.qw.dto.QwUserByToolDTO;
 import com.fs.qw.dto.QwUserDTO;
@@ -518,6 +517,4 @@ public interface QwUserMapper extends BaseMapper<QwUser>
 
     @Select("select * from qw_user where ipad_status = 1 and corp_id=#{corpId} and qw_user_id=#{qwUserId} limit 1 ")
     QwUser selectQwUserAppKeyAndIdByCorpIdAndUserIdAndIpad(@Param("corpId")String corpId,@Param("qwUserId") String qwUserId);
-
-    int addQwUserGroup(QwUserGroup qwUserGroup);
 }

fs-service/src/main/java/com/fs/qw/service/IQwUserService.java

@@ -2,7 +2,6 @@ package com.fs.qw.service;
 
 import com.fs.common.core.domain.R;
 import com.fs.qw.domain.QwUser;
-import com.fs.qw.domain.QwUserGroup;
 import com.fs.qw.domain.QwWorkTask;
 import com.fs.qw.dto.QwUserKeyDTO;
 import com.fs.qw.param.*;
@@ -219,8 +218,4 @@ public interface IQwUserService
 
     R unbindQwUserByServerIds(List<String> serverIds);
 
-    /**
-     * 新增员工组
-     */
-    R addQwUserGroup(QwUserGroup qwUserGroup);
 }

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

@@ -65,7 +65,6 @@ import java.net.URL;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -1626,16 +1625,6 @@ public class QwUserServiceImpl implements IQwUserService
         return R.ok();
     }
 
-    /**
-     * 新增员工组
-     */
-    @Override
-    public R addQwUserGroup(QwUserGroup qwUserGroup) {
-        qwUserGroup.setCreateTime(LocalDateTime.now());
-        int count = qwUserMapper.addQwUserGroup(qwUserGroup);
-        return count > 0 ? R.ok() : R.error();
-    }
-
     /**
      * 根据销售公司和企微ID查询企微用户
      */

fs-service/src/main/resources/mapper/qw/QwUserMapper.xml

@@ -151,12 +151,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <insert id="addQwUserGroup">
-        INSERT INTO qw_user_group (`group_name`, `company_id`, `qw_user_id`, `create_time`)
-        VALUES
-            (#{groupName}, #{companyId}, #{qw_user_id}, #{createTime});
-    </insert>
-
     <update id="updateQwUser" parameterType="QwUser">
         update qw_user
         <trim prefix="SET" suffixOverrides=",">