fix

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

@@ -66,7 +66,6 @@ public class ApiController extends BaseController {
 	@Autowired
 	private SyncSapUserToWxService syncSapUserToWxService;
 	
-	@Autowired
 	private static final String TOKEN = "UserId";
 
 	/**
@@ -204,13 +203,16 @@ public class ApiController extends BaseController {
 	@ResponseBody
 	public Object getToBeConfirmedList(HttpServletRequest request, @RequestBody GetToBeConfirmedListDTO dto) {
 		if (!isLogin(request)) {
-			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
+			return ResultUtil.error(ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
+			if(WebConstants.CACHE.containsKey(WebConstants.CACHE_SYNC_SAP)) {
+				return ResultUtil.error("数据正在同步，请稍等");
+			}
 			return ResultUtil.success(sapUserService.selectToBeConfirmedPrimaryList(dto), null);
 		} catch (Exception e) {
 			LoggerUtil.error(e);
-			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
+			return ResultUtil.error(ResultConstant.WEB_ERR_MSG);
 		}
 	}
 
@@ -219,7 +221,7 @@ public class ApiController extends BaseController {
 	@ResponseBody
 	public Object updateIngore(HttpServletRequest request, @RequestBody UpdateResultDTO dto) {
 		if (!isLogin(request)) {
-			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
+			return ResultUtil.error(ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
 			sapUserService.updateIngore(dto.getUserId());
@@ -235,7 +237,7 @@ public class ApiController extends BaseController {
 	@ResponseBody
 	public Object updateSync(HttpServletRequest request, @RequestBody UpdateResultDTO dto) {
 		if (!isLogin(request)) {
-			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
+			return ResultUtil.error(ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
 			SapUser sapUser = sapUserService.selectByUserId(dto.getUserId());