代码回退

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/ShopUserTypeComponent.java

@@ -441,32 +441,32 @@ public class ShopUserTypeComponent {
 
         if(StringUtils.isNotEmpty(dataUserId)) {
             //用户无效后接口获取不到企微id,需从关联表查询
-//            String loginName = userShopExtMapper.selectLoginNameByUserId(dataUserId, shopCode, usertype);
-//            if (loginName != null && !loginName.isEmpty()) {
-//                //查询用户信息
-//                SysUser user = sysUserMapper.selectUserByLoginName(loginName);
+            String loginName = userShopExtMapper.selectLoginNameByUserId(dataUserId, shopCode, usertype);
+            if (loginName != null && !loginName.isEmpty()) {
+                //查询用户信息
+                SysUser user = sysUserMapper.selectUserByLoginName(loginName);
                 int count = userShopExtMapper.delByDataUserId(dataUserId, shopCode);
                 log.info("删除门店用户扩展信息成功:" + count);
-//                //去掉该用户和角色的关联关系
-//                userRoleMapper.deleteUserRoleByUserIdAndExt(user.getUserId(), roleId, usertype);
-//                //离职处理以及用户主信息是否有门店账号处理需要添加
-//                //查询门店用户表是否存在用户和其他门店的关联关系，如果存在就不离职，不存在查询是否有经销商的关联关系，如果存在就不离职，不存在就离职
-//                SysUserShopExt shop = new SysUserShopExt();
-//                shop.setUserId(user.getUserId().toString());
-//                shop.setDelFlag("0");
-//                List<SysUserShopExt> shopExtList = userShopExtMapper.selectSysUserShopExtList(shop);
-//                if (shopExtList == null || shopExtList.size() == 0) {
-//                    //在查用户经销商扩展信息
-//                    SysUserExt userCustomerExt = sysUserExtMapper.selectSysUserExtById(user.getUserId());
-//                    user.setIsShopAccount("0");
-//                    if (userCustomerExt == null) {
-//                        //离职处理2
-//                        user.setQuit("2");
-//                    }
-//                    //修改用户信息
-//                    sysUserMapper.updateUser(user);
-//                }
- //           }
+                //去掉该用户和角色的关联关系
+                userRoleMapper.deleteUserRoleByUserIdAndExt(user.getUserId(), roleId, usertype);
+                //离职处理以及用户主信息是否有门店账号处理需要添加
+                //查询门店用户表是否存在用户和其他门店的关联关系，如果存在就不离职，不存在查询是否有经销商的关联关系，如果存在就不离职，不存在就离职
+                SysUserShopExt shop = new SysUserShopExt();
+                shop.setUserId(user.getUserId().toString());
+                shop.setDelFlag("0");
+                List<SysUserShopExt> shopExtList = userShopExtMapper.selectSysUserShopExtList(shop);
+                if (shopExtList == null || shopExtList.size() == 0) {
+                    //在查用户经销商扩展信息
+                    SysUserExt userCustomerExt = sysUserExtMapper.selectSysUserExtById(user.getUserId());
+                    user.setIsShopAccount("0");
+                    if (userCustomerExt == null) {
+                        //离职处理2
+                        user.setQuit("2");
+                    }
+                    //修改用户信息
+                    sysUserMapper.updateUser(user);
+                }
+            }
         }
     }