|
@@ -144,8 +144,7 @@ public class CommonLogic {
|
|
adminUserCom = new AdminUserCom();
|
|
adminUserCom = new AdminUserCom();
|
|
BeanUtils.copyProperties(adminUser,adminUserCom);
|
|
BeanUtils.copyProperties(adminUser,adminUserCom);
|
|
|
|
|
|
- //所有帐号
|
|
|
|
- adminUserCom = this.websitAccount(adminUserCom);
|
|
|
|
|
|
+
|
|
|
|
|
|
//商品出入库是否关联条码\
|
|
//商品出入库是否关联条码\
|
|
AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(adminUser.getCompanyWechatId());
|
|
AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(adminUser.getCompanyWechatId());
|
|
@@ -166,6 +165,9 @@ public class CommonLogic {
|
|
}else {
|
|
}else {
|
|
adminUserCom.setAdminWebsitIds(collect);
|
|
adminUserCom.setAdminWebsitIds(collect);
|
|
}
|
|
}
|
|
|
|
+ }else {
|
|
|
|
+ //所有帐号
|
|
|
|
+ adminUserCom = this.websitAccount(adminUserCom);
|
|
}
|
|
}
|
|
return adminUserCom;
|
|
return adminUserCom;
|
|
}
|
|
}
|