fix

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

@@ -14,13 +14,13 @@ import org.fouram.core.base.controller.BaseController;
 import org.fouram.core.plugin.weixin.cp.core.WXCpMailList;
 import org.fouram.core.util.AppUtil;
 import org.fouram.core.util.AppUtil.ResultConstant;
+import org.fouram.dto.input.GetToBeConfirmedListDTO;
+import org.fouram.dto.input.UpdateResultDTO;
 import org.fouram.core.util.ConfConfig;
 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.GetToBeConfirmedListDTO;
-import org.fouram.dto.UpdateResultDTO;
 import org.fouram.entity.SapOrg;
 import org.fouram.entity.SapUser;
 import org.fouram.enums.DelFlagEnum;
@@ -194,7 +194,9 @@ public class ApiController extends BaseController {
 	}
 
 	@ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "用户姓名", dataType = "String", paramType = "query"),
-			@ApiImplicitParam(name = "type", value = "同步类型", dataType = "String", paramType = "query") })
+			@ApiImplicitParam(name = "type", value = "同步类型", dataType = "String", paramType = "query"),
+			@ApiImplicitParam(name = "pageNumber", value = "第几页", dataType = "Integer", paramType = "query"),
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "Integer", paramType = "query")})
 	@ApiOperation(value = "查询待确认员工列表")
 	@PostMapping(value = "/getToBeConfirmedList", produces = "application/json;charset=utf-8")
 	@ResponseBody

code/sapparent/sapservice/src/main/java/org/fouram/dto/GetToBeConfirmedListDTO.java

@@ -1,4 +1,4 @@
-package org.fouram.dto;
+package org.fouram.dto.input;
 
 import java.io.Serializable;
 
@@ -18,4 +18,6 @@ public class GetToBeConfirmedListDTO implements Serializable {
 	
 	private String name;
 	private String type;
+	private Integer pageNumber;
+	private Integer pageSize;
 }

code/sapparent/sapservice/src/main/java/org/fouram/dto/UpdateResultDTO.java

@@ -1,4 +1,4 @@
-package org.fouram.dto;
+package org.fouram.dto.input;
 
 import java.io.Serializable;
 

code/sapparent/sapservice/src/main/java/org/fouram/dto/output/GetToBeConfirmedListOutput.java

@@ -0,0 +1,24 @@
+package org.fouram.dto.output;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.fouram.entity.SapUser;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class GetToBeConfirmedListOutput implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	private List<SapUser> data;
+	private Long total;
+}

code/sapparent/sapservice/src/main/java/org/fouram/entity/SapUser.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import org.apache.ibatis.type.Alias;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -61,9 +62,16 @@ public class SapUser implements Serializable {
 	private Integer sortNumber;
 	
 	// 敏感数据
+	@ApiModelProperty(value = "敏感数据sap职位")
 	private String sapPosition;
+	
+	@ApiModelProperty(value = "敏感数据微信职位")
 	private String wxPosition;
+	
+	@ApiModelProperty(value = "敏感数据sap部门")
 	private String sapFullDepart;
+	
+	@ApiModelProperty(value = "敏感数据微信部门")
 	private String wxFullDepart;
 
 	private List<List<SapOrg>> departList;

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

@@ -114,4 +114,16 @@
 		</if>
 		order by sortNumber ASC
 	</select>
+	
+	<select id="selectToBeConfirmedPrimaryTotal" resultType="Long">
+		select count(1) from sap_user 
+		where isPrimary = 1 and (delFlag = 0 or delFlag = 1) and result in ('ENTRY','LEAVE','SENSITIVE')
+		<if test="type != null and type != ''">
+			and result = #{type} 
+		</if>
+		<if test="name != null and name != ''">
+			and name like CONCAT(CONCAT('%', #{name}),'%')
+		</if>
+		order by sortNumber ASC
+	</select>
 </mapper>

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

@@ -16,7 +16,8 @@ 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.GetToBeConfirmedListDTO;
+import org.fouram.dto.input.GetToBeConfirmedListDTO;
+import org.fouram.dto.output.GetToBeConfirmedListOutput;
 import org.fouram.entity.SapOrg;
 import org.fouram.entity.SapUser;
 import org.fouram.entity.WxUser;
@@ -367,8 +368,10 @@ public class SapUserService extends BaseService {
 	}
 
 	@SuppressWarnings("unchecked")
-	public List<SapUser> selectToBeConfirmedPrimaryList(GetToBeConfirmedListDTO dto) throws Exception {
-		return toInfoDetails((List<SapUser>) findList("SapUserMapper.selectToBeConfirmedPrimaryList", dto));
+	public GetToBeConfirmedListOutput selectToBeConfirmedPrimaryList(GetToBeConfirmedListDTO dto) throws Exception {
+		List<SapUser> data = (List<SapUser>) findList("SapUserMapper.selectToBeConfirmedPrimaryList", dto);
+		Long total =  (Long) findObject("SapUserMapper.selectToBeConfirmedPrimaryTotal", dto);
+		return GetToBeConfirmedListOutput.builder().data(toInfoDetails(data)).total(total).build();
 	}
 
 	public void updateIngore(String personId) throws Exception {