liupeng 4 years ago
parent
commit
fcfd840879

+ 2 - 1
code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -22,6 +22,7 @@ import org.fouram.core.util.ResultUtil;
 import org.fouram.dto.input.GetIngoreListDTO;
 import org.fouram.dto.input.GetToBeConfirmedListDTO;
 import org.fouram.dto.input.UpdateResultDTO;
+import org.fouram.dto.output.GetIngoreListOutput;
 import org.fouram.dto.output.GetToBeConfirmedListOutput;
 import org.fouram.dto.output.SyncWeixinUserOutput;
 import org.fouram.entity.SapOrg;
@@ -265,7 +266,7 @@ public class ApiController extends BaseController {
 		}
 	}
 	
-	@ApiResponses(@ApiResponse(response = GetIngoreListDTO.class, code = 200, message = "success"))
+	@ApiResponses(@ApiResponse(response = GetIngoreListOutput.class, code = 200, message = "success"))
 	@ApiOperation(value = "查询忽略列表")
 	@PostMapping(value = "/getIngoreList", produces = "application/json;charset=utf-8")
 	@ResponseBody

+ 1 - 1
code/sapparent/sapservice/src/main/java/org/fouram/dto/output/GetCancelIngoreListOutput.java

@@ -15,7 +15,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class GetCancelIngoreListOutput implements Serializable {
+public class GetIngoreListOutput implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 	

+ 3 - 3
code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -18,7 +18,7 @@ import org.fouram.core.util.JsonNodeUtil;
 import org.fouram.core.util.Tools;
 import org.fouram.dto.input.GetIngoreListDTO;
 import org.fouram.dto.input.GetToBeConfirmedListDTO;
-import org.fouram.dto.output.GetCancelIngoreListOutput;
+import org.fouram.dto.output.GetIngoreListOutput;
 import org.fouram.dto.output.GetToBeConfirmedListOutput;
 import org.fouram.entity.SapOrg;
 import org.fouram.entity.SapUser;
@@ -420,7 +420,7 @@ public class SapUserService extends BaseService {
 	}
 
 	@SuppressWarnings("unchecked")
-	public GetCancelIngoreListOutput selectIngorePrimaryList(GetIngoreListDTO dto) throws Exception {
+	public GetIngoreListOutput selectIngorePrimaryList(GetIngoreListDTO dto) throws Exception {
 		PageData pd = new PageData();
 		pd.put("name", dto.getName());
 		pd.put("result", SapUserResultEnum.INGORE.getCode());
@@ -430,6 +430,6 @@ public class SapUserService extends BaseService {
 		}
 		List<SapUser> data = (List<SapUser>) findList("SapUserMapper.selectIngorePrimaryList", pd);
 		Long total = (Long) findObject("SapUserMapper.selectIngorePrimaryTotal", pd);
-		return GetCancelIngoreListOutput.builder().data(toInfoDetails(data)).total(total).build();
+		return GetIngoreListOutput.builder().data(toInfoDetails(data)).total(total).build();
 	}
 }