Commit 77cd6691 authored by wzp's avatar wzp

修改bug

parent 44d0dc5d
...@@ -128,7 +128,7 @@ public class TBoxOperationController extends BaseController { ...@@ -128,7 +128,7 @@ public class TBoxOperationController extends BaseController {
UpdateWrapper<TBoxOperation> wrapper = new UpdateWrapper<>(); UpdateWrapper<TBoxOperation> wrapper = new UpdateWrapper<>();
wrapper.eq("mac",tBoxOperation.getMac()); wrapper.eq("mac",tBoxOperation.getMac());
TBoxOperation one = tBoxOperationService.getOne(wrapper); 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)); 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("resultCode", "500");
resultMap.put("message", "此mac地址已绑定"+u.getUserName()+"账号!"); resultMap.put("message", "此mac地址已绑定"+u.getUserName()+"账号!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment