|
@@ -175,7 +175,9 @@ public class BackendStaffController extends BaseController {
|
|
|
if (mtStaff == null && StringUtil.isNotEmpty(id)) {
|
|
|
return getFailureResult(201, "员工信息不存在");
|
|
|
}
|
|
|
- mtStaff.setMerchantId(accountInfo.getMerchantId());
|
|
|
+ if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
|
|
|
+ mtStaff.setMerchantId(accountInfo.getMerchantId());
|
|
|
+ }
|
|
|
mtStaff.setStoreId(Integer.parseInt(storeId));
|
|
|
mtStaff.setRealName(realName);
|
|
|
if (PhoneFormatCheckUtils.isChinaPhoneLegal(mobile)) {
|