Merge branch 'wms_dev' into dev

This commit is contained in:
王奎兴
2026-02-12 10:10:49 +08:00
39 changed files with 1136 additions and 207 deletions
@@ -2022,6 +2022,10 @@ public class UserApplicationService {
*/
@Transactional(rollbackFor = Exception.class)
public int deleteByIds(List<Long> ids) {
// 检查ids是否为空
if (ids == null || ids.isEmpty()) {
throw new ServiceException("删除的用户ID列表不能为空");
}
//获取登录人信息
LoginUser loginUser = SecurityUtils.getLoginUser();
if (ObjectUtil.isNull(loginUser)) {
@@ -2042,8 +2046,10 @@ public class UserApplicationService {
userDomainService.updateUser(userDO);
}
}
//同步删除网货的员工信息
wlhyDomainService.deleteBatchPlatformUser(ids);
//同步删除网货的员工信息(只有当ids不为空时才调用)
if (!ids.isEmpty()) {
wlhyDomainService.deleteBatchPlatformUser(ids);
}
return ids.size();
}