Merge branch '20220303' into 'master'

20220303

See merge request huang/thingsboard3.3.2!54

@@ -43,7 +43,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 
 
 @RestController
 @RestController
 @RequiredArgsConstructor
 @RequiredArgsConstructor
-@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
 @RequestMapping("api/yt/convert")
 @RequestMapping("api/yt/convert")
 @Api(tags = {"数据流转控制器"})
 @Api(tags = {"数据流转控制器"})
 public class YtConvertDataToController extends BaseController {
 public class YtConvertDataToController extends BaseController {

@@ -154,7 +154,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (null != userDTO.getId()) {
     if (null != userDTO.getId()) {
       User user = baseMapper.selectById(userDTO.getId());
       User user = baseMapper.selectById(userDTO.getId());
       if (user.getPhoneNumber().equals(userDTO.getPhoneNumber())
       if (user.getPhoneNumber().equals(userDTO.getPhoneNumber())
-          && user.getEmail().equals(userDTO.getEmail())) {
+          && user.getEmail()!=null && user.getEmail().equals(userDTO.getEmail())) {
         needCheck = false;
         needCheck = false;
       }
       }
     }
     }