fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -19,7 +19,7 @@ import org.fouram.core.util.DateUtil;
 import org.fouram.core.util.ExcelExportUtil;
 import org.fouram.core.util.LoggerUtil;
 import org.fouram.core.util.ResultUtil;
-import org.fouram.dto.input.GetCancelIngoreListDTO;
+import org.fouram.dto.input.GetIngoreListDTO;
 import org.fouram.dto.input.GetToBeConfirmedListDTO;
 import org.fouram.dto.input.UpdateResultDTO;
 import org.fouram.dto.output.GetToBeConfirmedListOutput;
@@ -265,16 +265,16 @@ public class ApiController extends BaseController {
 		}
 	}
 	
-	@ApiResponses(@ApiResponse(response = GetCancelIngoreListDTO.class, code = 200, message = "success"))
-	@ApiOperation(value = "查询取消忽略列表")
-	@PostMapping(value = "/getCancelIngoreList", produces = "application/json;charset=utf-8")
+	@ApiResponses(@ApiResponse(response = GetIngoreListDTO.class, code = 200, message = "success"))
+	@ApiOperation(value = "查询忽略列表")
+	@PostMapping(value = "/getIngoreList", produces = "application/json;charset=utf-8")
 	@ResponseBody
-	public Object getCancelIngoreList(HttpServletRequest request, @RequestBody GetCancelIngoreListDTO dto) {
+	public Object getCancelIngoreList(HttpServletRequest request, @RequestBody GetIngoreListDTO dto) {
 		if (!isLogin(request)) {
 			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
-			return ResultUtil.success(sapUserService.selectCancelIngorePrimaryList(dto), null);
+			return ResultUtil.success(sapUserService.selectIngorePrimaryList(dto), null);
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);

code/sapparent/sapservice/src/main/java/org/fouram/dto/input/GetCancelIngoreListDTO.java

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

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapUserMapper.xml

@@ -133,7 +133,7 @@
 		order by sortNumber ASC
 	</select>
 	
-	<select id="selectCancelIngorePrimaryList" resultType="SapUser">
+	<select id="selectIngorePrimaryList" resultType="SapUser">
 		select * from sap_user 
 		where isPrimary = 1 and (delFlag = 0 or delFlag = 1) and result = #{result}
 		<if test="name != null and name != ''">
@@ -145,7 +145,7 @@
 		</if>
 	</select>
 	
-	<select id="selectCancelIngorePrimaryTotal" resultType="Long">
+	<select id="selectIngorePrimaryTotal" resultType="Long">
 		select count(1) from sap_user 
 		where isPrimary = 1 and (delFlag = 0 or delFlag = 1) and result = #{result}
 		<if test="name != null and name != ''">

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

@@ -16,7 +16,7 @@ import org.fouram.core.util.ConfConfig;
 import org.fouram.core.util.JSONUtil;
 import org.fouram.core.util.JsonNodeUtil;
 import org.fouram.core.util.Tools;
-import org.fouram.dto.input.GetCancelIngoreListDTO;
+import org.fouram.dto.input.GetIngoreListDTO;
 import org.fouram.dto.input.GetToBeConfirmedListDTO;
 import org.fouram.dto.output.GetCancelIngoreListOutput;
 import org.fouram.dto.output.GetToBeConfirmedListOutput;
@@ -395,7 +395,7 @@ public class SapUserService extends BaseService {
 			pd.put("pageSize", String.valueOf(dto.getPageSize()));
 		}
 		List<SapUser> data = (List<SapUser>) findList("SapUserMapper.selectToBeConfirmedPrimaryList", pd);
-		Long total = (Long) findObject("SapUserMapper.selectToBeConfirmedPrimaryTotal", dto);
+		Long total = (Long) findObject("SapUserMapper.selectToBeConfirmedPrimaryTotal", pd);
 		return GetToBeConfirmedListOutput.builder().data(toInfoDetails(data)).total(total).build();
 	}
 
@@ -420,7 +420,7 @@ public class SapUserService extends BaseService {
 	}
 
 	@SuppressWarnings("unchecked")
-	public GetCancelIngoreListOutput selectCancelIngorePrimaryList(GetCancelIngoreListDTO dto) throws Exception {
+	public GetCancelIngoreListOutput selectIngorePrimaryList(GetIngoreListDTO dto) throws Exception {
 		PageData pd = new PageData();
 		pd.put("name", dto.getName());
 		pd.put("result", SapUserResultEnum.INGORE.getCode());
@@ -428,8 +428,8 @@ public class SapUserService extends BaseService {
 			pd.put("pageCurrent", String.valueOf(dto.getPageSize() * (dto.getPageNumber() - 1)));
 			pd.put("pageSize", String.valueOf(dto.getPageSize()));
 		}
-		List<SapUser> data = (List<SapUser>) findList("SapUserMapper.selectCancelIngorePrimaryList", pd);
-		Long total = (Long) findObject("SapUserMapper.selectCancelIngorePrimaryTotal", dto);
+		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();
 	}
 }