Merge branch 'feature/quotation' into test

This commit is contained in:
曹鹏飞 2026-04-10 14:32:04 +08:00
commit e7398d4da4
3 changed files with 21 additions and 7 deletions

View File

@ -15,10 +15,4 @@ public class ApproveAppUserApplyforRequest {
@JsonIgnore @JsonIgnore
private String password; private String password;
/**
* 部门id
*/
@NotNull(message = "部门不能为空")
private Long departmentId;
} }

View File

@ -0,0 +1,21 @@
package com.nflg.mobilebroken.quotation.config;
import com.nflg.mobilebroken.starter.interceptor.LanguageInterceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.Resource;
@Configuration
public class WebConfig implements WebMvcConfigurer {
@Resource
private LanguageInterceptor languageInterceptor;
@Override
public void addInterceptors(InterceptorRegistry registry) {
// 注册拦截器并指定拦截路径
registry.addInterceptor(languageInterceptor).addPathPatterns("/**");
}
}

View File

@ -220,7 +220,6 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
.setCompanyId(String.valueOf(applyfor.getCompanyId())) .setCompanyId(String.valueOf(applyfor.getCompanyId()))
.setTitleId(applyfor.getTitleId()) .setTitleId(applyfor.getTitleId())
.setState(UserState.ToBeActivated.getState()) .setState(UserState.ToBeActivated.getState())
.setDepartmentId(request.getDepartmentId())
// .setRegionTypeId(appUser.getRegionTypeId()) // .setRegionTypeId(appUser.getRegionTypeId())
.setCreateBy(appUser.getName()) .setCreateBy(appUser.getName())
.setCreateTime(LocalDateTime.now()) .setCreateTime(LocalDateTime.now())