Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

@@ -128,7 +128,7 @@ public class TBoxOperationController extends BaseController {
                 UpdateWrapper<TBoxOperation> wrapper = new UpdateWrapper<>();
                 wrapper.eq("mac",tBoxOperation.getMac());
                 TBoxOperation one = tBoxOperationService.getOne(wrapper);
-                if (one!=null){
+                if (one!=null&&!one.getOrganId().equals(tBoxOperation.getOrganId())){
                     TUser u = userService.getOne(new UpdateWrapper<TUser>().eq("org_id", one.getOrganId()).eq("type", 3).eq("is_deleted", false));
                     resultMap.put("resultCode", "500");
                     resultMap.put("message", "此mac地址已绑定"+u.getUserName()+"账号！");