fix

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

@@ -16,6 +16,7 @@ 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.dto.output.GetToBeConfirmedListOutput;
 import org.fouram.core.util.ConfConfig;
 import org.fouram.core.util.DateUtil;
 import org.fouram.core.util.ExcelExportUtil;
@@ -43,6 +44,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import me.chanjar.weixin.cp.bean.WxCpOauth2UserInfo;
 
 @Controller
@@ -197,6 +200,7 @@ public class ApiController extends BaseController {
 			@ApiImplicitParam(name = "type", value = "同步类型", dataType = "String", paramType = "query"),
 			@ApiImplicitParam(name = "pageNumber", value = "第几页", dataType = "Integer", paramType = "query"),
 			@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "Integer", paramType = "query")})
+	@ApiResponses(@ApiResponse(response = GetToBeConfirmedListOutput.class, code = 200, message = "success"))
 	@ApiOperation(value = "查询待确认员工列表")
 	@PostMapping(value = "/getToBeConfirmedList", produces = "application/json;charset=utf-8")
 	@ResponseBody
@@ -205,7 +209,7 @@ public class ApiController extends BaseController {
 			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
-			return AppUtil.success(sapUserService.selectToBeConfirmedPrimaryList(dto), null);
+			return ResultUtil.success(sapUserService.selectToBeConfirmedPrimaryList(dto), null);
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
@@ -222,7 +226,7 @@ public class ApiController extends BaseController {
 		}
 		try {
 			sapUserService.updateIngore(dto.getUserId());
-			return AppUtil.success();
+			return ResultUtil.success(null, "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
@@ -239,7 +243,7 @@ public class ApiController extends BaseController {
 		}
 		try {
 			sapUserService.updateSyncWxResult(dto.getUserId());
-			return AppUtil.success();
+			return ResultUtil.success(null, "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
@@ -252,7 +256,7 @@ public class ApiController extends BaseController {
 	public Object syncWeixinUser() {
 		try {
 			syncSapUserToWxService.taskBiz();
-			return AppUtil.success();
+			return ResultUtil.success(null, "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);

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

@@ -28,9 +28,11 @@ public class SapUser implements Serializable {
 	private String userId;
 	private String personId;
 	private String avatar;
-	// 邮箱
+
+	@ApiModelProperty(value = "邮箱")
 	private String username;
-	// 姓名
+	
+	@ApiModelProperty(value = "姓名")
 	private String name;
 
 	// sap机构
@@ -61,7 +63,6 @@ public class SapUser implements Serializable {
 	private Date createDate;
 	private Integer sortNumber;
 	
-	// 敏感数据
 	@ApiModelProperty(value = "敏感数据sap职位")
 	private String sapPosition;