fix

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -973,7 +973,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		List<User> users = userMapper.selectBatchIds(userIds);
 		for (User relateUser : users) {
 			relateUser.setIsBlack(Boolean.TRUE);
-			userMapper.updateById(relateUser);
 
 			if (StrUtil.isNotBlank(relateUser.getLoginPhone())) {
 				UserBindDetail bindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class).eq(UserBindDetail::getPhone, relateUser.getLoginPhone()).last("limit 1"));
@@ -1002,6 +1001,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 				}
 
 			}
+			userMapper.updateById(relateUser);
 
 			//用户拉黑记录
 			UserBlackRecord userBlackRecord = new UserBlackRecord();

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsUserController.java

@@ -228,8 +228,6 @@ public class CmsUserController{
 
             for (User relateUser : users) {
                 relateUser.setIsBlack(isBlack);
-                userMapper.updateById(relateUser);
-
                 //拉黑 关联去掉
                 if (isBlack) {
                     if (StrUtil.isNotBlank(relateUser.getLoginPhone())) {
@@ -260,6 +258,17 @@ public class CmsUserController{
 
                     }
                 }
+                //解冻
+                if (!isBlack) {
+                    if (StrUtil.isNotBlank(relateUser.getLoginPhone())) {
+                        relateUser.setLoginPhone(relateUser.getLoginPhone().replaceAll("#", ""));
+                    }
+                    if (StrUtil.isNotBlank(relateUser.getEmail())) {
+                        relateUser.setLoginPhone(relateUser.getEmail().replaceAll("#", ""));
+                    }
+                }
+
+                userMapper.updateById(relateUser);
 
                 //用户拉黑记录
                 UserBlackRecord userBlackRecord = new UserBlackRecord();
@@ -273,7 +282,6 @@ public class CmsUserController{
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
-
     /**
      * 修改用户查看验证码次数
      */