Browse Source

解绑微信

yh 3 days ago
parent
commit
764bf9ba53

+ 10 - 0
fs-admin/src/main/java/com/fs/web/controller/system/SysUserController.java

@@ -2,6 +2,7 @@ package com.fs.web.controller.system;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.fs.common.constant.HttpStatus;
@@ -10,6 +11,7 @@ import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.core.page.PageDomain;
 import com.fs.common.core.page.TableSupport;
 import com.fs.common.utils.ServletUtils;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -263,4 +265,12 @@ public class SysUserController extends BaseController
         Boolean isAdmin= SecurityUtils.isAdmin(loginUser.getUser().getUserId());
         return R.ok().put("data",isAdmin);
     }
+
+    @PreAuthorize("@ss.hasPermi('system:user:unBind')")
+    @ApiOperation("解绑微信")
+    @PostMapping("/unBind")
+    public AjaxResult unBind(@RequestBody Map<String, String> userIdMap){
+        String userId = userIdMap.get("userId");
+        return toAjax(userService.unBind(userId));
+    }
 }

+ 8 - 0
fs-company/src/main/java/com/fs/company/controller/company/CompanyUserController.java

@@ -869,4 +869,12 @@ public class CompanyUserController extends BaseController {
         List<com.fs.hisStore.domain.FsUserScrm> userList = companyUserService.selectBoundFsUsersByCompanyUserId(companyUserId);
         return R.ok().put("data", userList);
     }
+
+    @PreAuthorize("@ss.hasPermi('company:user:unBind')")
+    @ApiOperation("解绑微信")
+    @PostMapping("/unBind")
+    public AjaxResult unBind(@RequestBody Map<String, String> userIdMap){
+        String userId = userIdMap.get("userId");
+        return toAjax(companyUserService.unBind(userId));
+    }
 }

+ 1 - 0
fs-service/src/main/java/com/fs/company/mapper/CompanyUserMapper.java

@@ -351,4 +351,5 @@ public interface CompanyUserMapper
      */
     List<com.fs.hisStore.domain.FsUserScrm> selectBoundFsUsersByCompanyUserId(@Param("companyUserId") Long companyUserId);
 
+    int unBind(String userId);
 }

+ 2 - 0
fs-service/src/main/java/com/fs/company/service/ICompanyUserService.java

@@ -264,4 +264,6 @@ public interface ICompanyUserService {
      * @return 绑定的用户列表
      */
     List<com.fs.hisStore.domain.FsUserScrm> selectBoundFsUsersByCompanyUserId(Long companyUserId);
+
+    int unBind(String userId);
 }

+ 5 - 0
fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -1096,4 +1096,9 @@ public class CompanyUserServiceImpl implements ICompanyUserService
     public List<com.fs.hisStore.domain.FsUserScrm> selectBoundFsUsersByCompanyUserId(Long companyUserId) {
         return companyUserMapper.selectBoundFsUsersByCompanyUserId(companyUserId);
     }
+
+    @Override
+    public int unBind(String userId) {
+        return companyUserMapper.unBind(userId);
+    }
 }

+ 2 - 0
fs-service/src/main/java/com/fs/system/mapper/SysUserMapper.java

@@ -132,4 +132,6 @@ public interface SysUserMapper
     public SysUser checkEmailUnique(String email);
 
     List<SysUser> selectUserByPhone(String phone);
+
+    int unBind(String userId);
 }

+ 2 - 0
fs-service/src/main/java/com/fs/system/service/ISysUserService.java

@@ -216,4 +216,6 @@ public interface ISysUserService
     int updateUserInfo(SysUser sysuser);
 
     List<SysUser> selectUserByPhone(String phone);
+
+    int unBind(String userId);
 }

+ 5 - 0
fs-service/src/main/java/com/fs/system/service/impl/SysUserServiceImpl.java

@@ -590,4 +590,9 @@ public class SysUserServiceImpl implements ISysUserService
     public List<SysUser> selectUserByPhone(String phone) {
         return userMapper.selectUserByPhone(phone);
     }
+
+    @Override
+    public int unBind(String userId) {
+        return userMapper.unBind(userId);
+    }
 }

+ 4 - 0
fs-service/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -725,6 +725,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <update id="unBind">
+        update company_user set union_id=null where user_id=#{userId}
+    </update>
+
     <!-- 根据销售ID查询绑定的fs_user用户列表 -->
     <select id="selectBoundFsUsersByCompanyUserId" resultType="com.fs.hisStore.domain.FsUserScrm">
         SELECT *

+ 5 - 1
fs-service/src/main/resources/mapper/system/SysUserMapper.xml

@@ -322,7 +322,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
 
-	<delete id="deleteUserById" parameterType="Long">
+    <update id="unBind">
+		update sys_user set union_id = null where user_id = #{userId}
+	</update>
+
+    <delete id="deleteUserById" parameterType="Long">
 		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>