251222_01_FIX : 변수명 변경 및 Entity 생성 모두 빌더 타입으로 교체
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package com.kri.contact.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.contact.server.common.consts.AppConstant;
|
||||
import com.kri.contact.server.common.consts.ContactConstant;
|
||||
import com.kri.contact.server.dto.DataVerificationDto;
|
||||
import com.kri.contact.server.dto.ExcelUploadResponseDto;
|
||||
import com.kri.contact.server.dto.UserInfoDto;
|
||||
@@ -40,7 +40,7 @@ public class UserController {
|
||||
@GetMapping()
|
||||
public List<UserInfoDto> getUserList(RequestUserContext ctx){
|
||||
String searchCmpn = ctx.getUserCmpn();
|
||||
if(ctx.getUserRole() < AppConstant.OUTSOURCE_USER_ROLE){
|
||||
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE){
|
||||
return userService.getUserList();
|
||||
}
|
||||
else{
|
||||
@@ -51,7 +51,7 @@ public class UserController {
|
||||
@GetMapping("fieldwork")
|
||||
public List<UserInfoDto> getFiledoworkUserList(RequestUserContext ctx){
|
||||
String searchCmpn = ctx.getUserCmpn();
|
||||
if(ctx.getUserRole() < AppConstant.OUTSOURCE_USER_ROLE){
|
||||
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE){
|
||||
searchCmpn = "";
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ public class UserController {
|
||||
|
||||
@GetMapping("cmpn")
|
||||
public List<String> getUserCmpnList(RequestUserContext ctx){
|
||||
if(ctx.getUserRole() < AppConstant.OUTSOURCE_USER_ROLE){
|
||||
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE){
|
||||
return userService.getUserCmpnList();
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ public class UserController {
|
||||
String regId = ctx.getUserId();
|
||||
String clientIp = ctx.getClientIp();
|
||||
//외주사급이 업로드로 계정을 생성하는 경우 자신의 회사명으로 고정
|
||||
String forceCmpn = ctx.getUserRole() < AppConstant.OUTSOURCE_USER_ROLE? "" : ctx.getUserCmpn();
|
||||
String forceCmpn = ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE? "" : ctx.getUserCmpn();
|
||||
|
||||
ExcelUploadResponseDto result = userService.createUsersFromExcel(file, regId, forceCmpn);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user