Antiloveg hace 9 años
padre
commit
b2d18aace6

+ 134 - 61
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -298,8 +298,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/orgHumanResource", method = RequestMethod.POST)
 	public Result orgHumanResource(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -309,7 +311,6 @@ public class AdminApiController extends BaseApiController {
 				pNo = Integer.parseInt(pageNo);
 			}
 			res.setData(orgHumanResourceService.listOrgHumanResource(year, pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -322,18 +323,22 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/updateOrgHumanResource", method = RequestMethod.POST)
 	public Result updateOrgHumanResource(OrgHumanResource orgHumanResource) {
 		Result res = new Result();
-		if (StringUtils.isBlank(orgHumanResource.getId())) {
-			if (null != orgHumanResourceService.selectOrgHumanResourceByUidAndYear(orgHumanResource.getYear(),
-					orgHumanResource.getUid())){
-				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度人力资源情况已录入!"));
-				return res;
-			}
-			orgHumanResource.setId(UUID.randomUUID().toString());
-			orgHumanResource.setDeletedSign(0);
-			orgHumanResourceService.insert(orgHumanResource);
-		} else {
-			orgHumanResourceService.updateByPrimaryKeySelective(orgHumanResource);
+		if (StringUtils.isBlank(orgHumanResource.getUid()) ||  !checkCertify(res, orgHumanResource.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
 		}
+			if (StringUtils.isBlank(orgHumanResource.getId())) {
+				if (null != orgHumanResourceService.selectOrgHumanResourceByUidAndYear(orgHumanResource.getYear(),
+						orgHumanResource.getUid())){
+					res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度人力资源情况已录入!"));
+					return res;
+				}
+				orgHumanResource.setId(UUID.randomUUID().toString());
+				orgHumanResource.setDeletedSign(0);
+				orgHumanResourceService.insert(orgHumanResource);
+			} else {
+				orgHumanResourceService.updateByPrimaryKeySelective(orgHumanResource);
+			}
 		return res;
 	}
 
@@ -348,8 +353,10 @@ public class AdminApiController extends BaseApiController {
 	public Result standard(String uid, String standardName, String standardNumber, Integer standardLevel,
 			Integer participateWay, String pageNo, String pageSize) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -360,7 +367,6 @@ public class AdminApiController extends BaseApiController {
 			}
 			res.setData(orgStandardService.listOrgStandard(standardName, standardNumber, standardLevel, participateWay,
 					pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -373,16 +379,20 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/developStandard", method = RequestMethod.POST)
 	public Result developStandard(OrgStandard orgStandard) {
 		Result res = new Result();
-		if (StringUtils.isBlank(orgStandard.getId())) {
-			orgStandard.setId(UUID.randomUUID().toString());
-			orgStandard.setDeletedSign(0);
-			Calendar now = Calendar.getInstance();
-			now.set(Calendar.MILLISECOND, 0);
-			orgStandard.setCreateTime(now.getTime());
-			orgStandardService.insert(orgStandard);
-		} else {
-			orgStandardService.updateByPrimaryKeySelective(orgStandard);
+		if (StringUtils.isBlank(orgStandard.getUid()) ||  !checkCertify(res, orgStandard.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
 		}
+			if (StringUtils.isBlank(orgStandard.getId())) {
+				orgStandard.setId(UUID.randomUUID().toString());
+				orgStandard.setDeletedSign(0);
+				Calendar now = Calendar.getInstance();
+				now.set(Calendar.MILLISECOND, 0);
+				orgStandard.setCreateTime(now.getTime());
+				orgStandardService.insert(orgStandard);
+			} else {
+				orgStandardService.updateByPrimaryKeySelective(orgStandard);
+			}
 		res.setData(orgStandard);
 		return res;
 	}
@@ -397,6 +407,10 @@ public class AdminApiController extends BaseApiController {
 	public Result intellectual(OrgIntellectualProperty orgIntellectualProperty, String authorizationDateFormattedDate,
 			String uid) throws ParseException {
 		Result res = new Result();
+		if (StringUtils.isBlank(orgIntellectualProperty.getUid()) ||  !checkCertify(res, orgIntellectualProperty.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			orgIntellectualProperty
 					.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
@@ -425,8 +439,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/intellectualList", method = RequestMethod.POST)
 	public Result intellectualList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -436,7 +452,6 @@ public class AdminApiController extends BaseApiController {
 				pNo = Integer.parseInt(pageNo);
 			}
 			res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -450,8 +465,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/techProductList", method = RequestMethod.POST)
 	public Result techProductList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -461,7 +478,6 @@ public class AdminApiController extends BaseApiController {
 				pNo = Integer.parseInt(pageNo);
 			}
 			res.setData(orgTechProductService.listTechProduct(pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -481,8 +497,10 @@ public class AdminApiController extends BaseApiController {
 	public Result activityList(String activityNumber, String activityName, String startDateFormattedDate,
 			String endDateFormattedDate, String pageNo, String pageSize, String uid) throws ParseException {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -493,7 +511,6 @@ public class AdminApiController extends BaseApiController {
 			}
 			res.setData(orgActivityService.listOrgActivity(activityNumber, activityName, startDateFormattedDate,
 					endDateFormattedDate, pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -508,6 +525,10 @@ public class AdminApiController extends BaseApiController {
 	public Result activity(OrgActivity orgActivity, String startDateFormattedDate, String endDateFormattedDate)
 			throws ParseException {
 		Result res = new Result();
+		if (StringUtils.isBlank(orgActivity.getUid()) ||  !checkCertify(res, orgActivity.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		orgActivity.setDeletedSign(0);
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, "yyyy-MM-dd"));
@@ -518,7 +539,6 @@ public class AdminApiController extends BaseApiController {
 		}
 		if (StringUtils.isBlank(orgActivity.getId())) {
 			orgActivity.setId(UUID.randomUUID().toString());
-			orgActivity.setUid(TokenManager.getUserId());
 			orgActivityService.insert(orgActivity);
 		} else {
 			orgActivityService.updateOrgActivity(orgActivity);
@@ -537,8 +557,10 @@ public class AdminApiController extends BaseApiController {
 	public Result activityCostList(String activityNumber, String startDateFormattedDate, String endDateFormattedDate,
 			String pageNo, String pageSize, String uid) throws ParseException {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -549,7 +571,6 @@ public class AdminApiController extends BaseApiController {
 			}
 			res.setData(orgActivityCostService.listOrgActivityCost(activityNumber, startDateFormattedDate,
 					endDateFormattedDate, pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -562,13 +583,17 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/activityCost", method = RequestMethod.POST)
 	public Result activityCost(OrgActivityCost orgActivityCost, String signDateFormattedDate) throws ParseException {
 		Result res = new Result();
+		if (StringUtils.isBlank(orgActivityCost.getUid()) ||  !checkCertify(res, orgActivityCost.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (StringUtils.isBlank(signDateFormattedDate)) {
 			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
 		}
 
 		if (StringUtils.isBlank(orgActivityCost.getId())) {
 			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(orgActivityCost.getAid(),
-					TokenManager.getUserId())){
+					orgActivityCost.getUid())){
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
@@ -594,6 +619,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/techProduct", method = RequestMethod.POST)
 	public Result techProduct(OrgTechProduct orgTechProduct) {
 		Result res = new Result();
+		if (StringUtils.isBlank(orgTechProduct.getUid()) ||  !checkCertify(res, orgTechProduct.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (StringUtils.isBlank(orgTechProduct.getId())) {
 			orgTechProduct.setId(UUID.randomUUID().toString());
 			orgTechProduct.setDeletedSign(0);
@@ -617,8 +646,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/ratepay", method = RequestMethod.POST)
 	public Result ratepay(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -628,7 +659,7 @@ public class AdminApiController extends BaseApiController {
 				pNo = Integer.parseInt(pageNo);
 			}
 			res.setData(orgRatepayService.listOrgRatepay(year, pNo, pSize, uid));
-		}
+
 		return res;
 	}
 
@@ -638,6 +669,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeRatepay", method = RequestMethod.POST)
 	public Result disposeRatepay(OrgRatepay orgRatepay) {
 		Result res = new Result();
+		if (StringUtils.isBlank(orgRatepay.getUid()) ||  !checkCertify(res, orgRatepay.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (StringUtils.isBlank(orgRatepay.getId())) {
 			if (null == orgRatepayService.selectRatepayByUidAndYear(orgRatepay.getUid(), orgRatepay.getYear())) {
 				orgRatepay.setId(UUID.randomUUID().toString());
@@ -661,8 +696,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/finance", method = RequestMethod.POST)
 	public Result finance(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -672,7 +709,6 @@ public class AdminApiController extends BaseApiController {
 				pNo = Integer.parseInt(pageNo);
 			}
 			res.setData(orgFinanceService.listFinance(year, pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -685,6 +721,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeFinance", method = RequestMethod.POST)
 	public Result disposeFinance(OrgFinance orgFinance) {
 		Result res = new Result();
+		if (StringUtils.isBlank(orgFinance.getUid()) ||  !checkCertify(res, orgFinance.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (StringUtils.isBlank(orgFinance.getId())) {
 			if (null == orgFinanceService.selectFinanceByUidAndYear(orgFinance.getUid(), orgFinance.getYear())) {
 				orgFinance.setId(UUID.randomUUID().toString());
@@ -724,8 +764,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/achievementList", method = RequestMethod.POST)
 	public Result achievementList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -735,7 +777,6 @@ public class AdminApiController extends BaseApiController {
 				pNo = Integer.parseInt(pageNo);
 			}
 			res.setData(orgTechAchievementService.listOrgTechAchievement(pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -749,10 +790,14 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAchievement", method = RequestMethod.POST)
 	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException {
 		Result res = new Result();
+		if (StringUtils.isBlank(achievement.getUid()) ||  !checkCertify(res, achievement.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (StringUtils.isBlank(achievement.getId())) {
 			achievement.setId(UUID.randomUUID().toString());
 			achievement.setDeletedSign(0);
-			orgTechAchievementService.inset(achievement);
+			orgTechAchievementService.insert(achievement);
 		} else {
 			orgTechAchievementService.updateByPrimaryKeySelective(achievement);
 		}
@@ -767,8 +812,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/honorList", method = RequestMethod.POST)
 	public Result honorList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -778,7 +825,6 @@ public class AdminApiController extends BaseApiController {
 				pNo = Integer.parseInt(pageNo);
 			}
 			res.setData(orgHonorDatumService.listOrgHonorDatum(pNo, pSize, uid));
-		}
 		return res;
 	}
 
@@ -790,16 +836,19 @@ public class AdminApiController extends BaseApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/disposeHonor", method = RequestMethod.POST)
-	public Result disposeHonor(OrgHonorDatum honor, String issuingTimeFormattedDate, String uid) throws ParseException {
+	public Result disposeHonor(OrgHonorDatum honor, String issuingTimeFormattedDate) throws ParseException {
 		Result res = new Result();
+		if (StringUtils.isBlank(honor.getUid()) ||  !checkCertify(res, honor.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
 			honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, "yyyy-MM-dd"));
 		}
 		if (StringUtils.isBlank(honor.getId())) {
 			honor.setId(UUID.randomUUID().toString());
-			honor.setUid(uid);
 			honor.setDeletedSign(0);
-			orgHonorDatumService.inset(honor);
+			orgHonorDatumService.insert(honor);
 		} else {
 			orgHonorDatumService.updateByPrimaryKeySelective(honor);
 		}
@@ -814,10 +863,11 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/center", method = RequestMethod.POST)
 	public Result center(String uid) {
 		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
-			res.setData(orgTechCenterService.selectOrgTechCenterByUid(uid));
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
 		}
+		res.setData(orgTechCenterService.selectOrgTechCenterByUid(uid));
 		return res;
 	}
 
@@ -828,15 +878,18 @@ public class AdminApiController extends BaseApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/disposeCenter", method = RequestMethod.POST)
-	public Result disposeCenter(OrgTechCenter orgTechCenter, String foundingTimeFormattedDate, String uid)
+	public Result disposeCenter(OrgTechCenter orgTechCenter, String foundingTimeFormattedDate)
 			throws ParseException {
 		Result res = new Result();
+		if (StringUtils.isBlank(orgTechCenter.getUid()) ||  !checkCertify(res, orgTechCenter.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, "yyyy-MM-dd"));
 		}
 		if (StringUtils.isBlank(orgTechCenter.getId())) {
 			orgTechCenter.setId(UUID.randomUUID().toString());
-			orgTechCenter.setUid(uid);
 			orgTechCenter.setDeletedSign(0);
 			orgTechCenterService.insert(orgTechCenter);
 		} else {
@@ -866,6 +919,10 @@ public class AdminApiController extends BaseApiController {
 	public Result applyCognizance(Integer contacts, String comment, String consultant, String uid, Integer year,
 			Integer state) {
 		Result res = new Result();
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, uid)) {
 			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
 		}
@@ -923,6 +980,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/cognizanceDetail", method = RequestMethod.POST)
 	public Result cognizanceDetail(String uid, String cid, Integer year) {
 		Result res = new Result();
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		res.setData(handleCognizanceDetail(uid, cid, year));
 		return res;
 	}
@@ -936,6 +997,10 @@ public class AdminApiController extends BaseApiController {
 	public Result disposeCognizanceDetail(OrgCognizance cog, OrgCognizanceLog log, String recordTimeFormattedDate)
 			throws ParseException {
 		Result res = new Result();
+		if (StringUtils.isBlank(cog.getUid()) ||  !checkCertify(res, cog.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		Date recordTime = null;
 		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
 			recordTime = DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd");
@@ -1027,6 +1092,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/annualReportDetail", method = RequestMethod.POST)
 	public Result annualReportDetail(String uid, Integer year) {
 		Result res = new Result();
+		if (StringUtils.isBlank(uid) ||  !checkCertify(res, uid).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		res.setData(handleAnnualReport(uid, year));
 		return res;
 	}
@@ -1040,6 +1109,10 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAnnualReport", method = RequestMethod.POST)
 	public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport) {
 		Result res = new Result();
+		if (StringUtils.isBlank(orgAnnualReport.getUid()) ||  !checkCertify(res, orgAnnualReport.getUid()).getError().isEmpty()){
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
+			return res;
+		}
 		if (StringUtils.isBlank(orgAnnualReport.getId())) {
 			if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(),
 					orgAnnualReport.getUid())) {

+ 263 - 216
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -138,22 +138,25 @@ public class CognizanceApiController extends BaseApiController {
 	public Result activity(OrgActivity orgActivity, String startDateFormattedDate, String endDateFormattedDate)
 			throws ParseException {
 		Result res = new Result();
-		orgActivity.setDeletedSign(0);
-		if (!StringUtils.isBlank(startDateFormattedDate)) {
-			orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, "yyyy-MM-dd"));
-		}
-
-		if (!StringUtils.isBlank(endDateFormattedDate)) {
-			orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, "yyyy-MM-dd"));
-		}
-		if (StringUtils.isBlank(orgActivity.getId())) {
-			orgActivity.setId(UUID.randomUUID().toString());
-			orgActivity.setUid(TokenManager.getUserId());
-			orgActivityService.insert(orgActivity);
-		} else {
-			orgActivityService.updateOrgActivity(orgActivity);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			orgActivity.setDeletedSign(0);
+			if (!StringUtils.isBlank(startDateFormattedDate)) {
+				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, "yyyy-MM-dd"));
+			}
+	
+			if (!StringUtils.isBlank(endDateFormattedDate)) {
+				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, "yyyy-MM-dd"));
+			}
+			if (StringUtils.isBlank(orgActivity.getId())) {
+				orgActivity.setId(UUID.randomUUID().toString());
+				orgActivity.setUid(TokenManager.getUserId());
+				orgActivityService.insert(orgActivity);
+			} else {
+				orgActivityService.updateOrgActivity(orgActivity);
+			}
+			res.setData(orgActivity);
 		}
-		res.setData(orgActivity);
 		return res;
 	}
 
@@ -166,12 +169,12 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteActivity", method = RequestMethod.POST)
 	public Result deleteActivity(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		orgActivityService.batchDeleteByPrimaryKey(id);
-		orgActivityCostService.batchDeleteByAid(id);
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			orgActivityService.batchDeleteByPrimaryKey(id);
+			orgActivityCostService.batchDeleteByAid(id);
 		return res;
 	}
 
@@ -210,25 +213,28 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/activityCost", method = RequestMethod.POST)
 	public Result activityCost(OrgActivityCost orgActivityCost, String signDateFormattedDate) throws ParseException {
 		Result res = new Result();
-		if (!StringUtils.isBlank(signDateFormattedDate)) {
-			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
-		}
-		if (StringUtils.isBlank(orgActivityCost.getId())) {
-			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(orgActivityCost.getAid(),
-					TokenManager.getUserId())){
-				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
-				return res;
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (!StringUtils.isBlank(signDateFormattedDate)) {
+				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
+			}
+			if (StringUtils.isBlank(orgActivityCost.getId())) {
+				if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(orgActivityCost.getAid(),
+						TokenManager.getUserId())){
+					res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
+					return res;
+				}
+				
+				OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
+				orgActivityCost.setStartDate(ac.getStartDate());
+				orgActivityCost.setEndDate(ac.getEndDate());
+				orgActivityCost.setId(UUID.randomUUID().toString());
+				orgActivityCost.setUid(TokenManager.getUserId());
+				orgActivityCost.setDeletedSign(0);
+				orgActivityCostService.insert(orgActivityCost);
+			} else {
+				orgActivityCostService.updateByPrimaryKeySelective(orgActivityCost);
 			}
-			
-			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
-			orgActivityCost.setStartDate(ac.getStartDate());
-			orgActivityCost.setEndDate(ac.getEndDate());
-			orgActivityCost.setId(UUID.randomUUID().toString());
-			orgActivityCost.setUid(TokenManager.getUserId());
-			orgActivityCost.setDeletedSign(0);
-			orgActivityCostService.insert(orgActivityCost);
-		} else {
-			orgActivityCostService.updateByPrimaryKeySelective(orgActivityCost);
 		}
 		return res;
 	}
@@ -242,11 +248,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteActivityCost", method = RequestMethod.POST)
 	public Result deleteActivityCost(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(orgActivityCostService.batchDeleteByPrimaryKey(id));
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			res.setData(orgActivityCostService.batchDeleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -283,18 +289,21 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/developStandard", method = RequestMethod.POST)
 	public Result developStandard(OrgStandard orgStandard) {
 		Result res = new Result();
-		if (StringUtils.isBlank(orgStandard.getId())) {
-			orgStandard.setId(UUID.randomUUID().toString());
-			orgStandard.setUid(TokenManager.getUserId());
-			orgStandard.setDeletedSign(0);
-			Calendar now = Calendar.getInstance();
-			now.set(Calendar.MILLISECOND, 0);
-			orgStandard.setCreateTime(now.getTime());
-			orgStandardService.insert(orgStandard);
-		} else {
-			orgStandardService.updateByPrimaryKeySelective(orgStandard);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (StringUtils.isBlank(orgStandard.getId())) {
+				orgStandard.setId(UUID.randomUUID().toString());
+				orgStandard.setUid(TokenManager.getUserId());
+				orgStandard.setDeletedSign(0);
+				Calendar now = Calendar.getInstance();
+				now.set(Calendar.MILLISECOND, 0);
+				orgStandard.setCreateTime(now.getTime());
+				orgStandardService.insert(orgStandard);
+			} else {
+				orgStandardService.updateByPrimaryKeySelective(orgStandard);
+			}
+			res.setData(orgStandard);
 		}
-		res.setData(orgStandard);
 		return res;
 	}
 
@@ -308,11 +317,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteStandard", method = RequestMethod.POST)
 	public Result deleteStandard(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(orgStandardService.batchDeleteByPrimaryKey(id));
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			res.setData(orgStandardService.batchDeleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -326,20 +335,23 @@ public class CognizanceApiController extends BaseApiController {
 	public Result intellectual(OrgIntellectualProperty orgIntellectualProperty, String authorizationDateFormattedDate)
 			throws ParseException {
 		Result res = new Result();
-		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
-			orgIntellectualProperty
-					.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
-		}
-		if (StringUtils.isBlank(orgIntellectualProperty.getId())) {
-			orgIntellectualProperty.setId(UUID.randomUUID().toString());
-			orgIntellectualProperty.setUid(TokenManager.getUserId());
-			orgIntellectualProperty.setEvaluationCategory(
-					(orgIntellectualProperty.getCatagory() >= 2 && orgIntellectualProperty.getCatagory() <= 4) ? 1 : 0);
-			orgIntellectualProperty.setDeletedSign(0);
-			res.setData(orgIntellectualPropertyService.insert(orgIntellectualProperty));
-		} else {
-			orgIntellectualProperty.setEvaluationCategory(orgIntellectualProperty.getCatagory() <= 2 ? 1 : 0);
-			res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(orgIntellectualProperty));
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
+				orgIntellectualProperty
+						.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
+			}
+			if (StringUtils.isBlank(orgIntellectualProperty.getId())) {
+				orgIntellectualProperty.setId(UUID.randomUUID().toString());
+				orgIntellectualProperty.setUid(TokenManager.getUserId());
+				orgIntellectualProperty.setEvaluationCategory(
+						(orgIntellectualProperty.getCatagory() >= 2 && orgIntellectualProperty.getCatagory() <= 4) ? 1 : 0);
+				orgIntellectualProperty.setDeletedSign(0);
+				res.setData(orgIntellectualPropertyService.insert(orgIntellectualProperty));
+			} else {
+				orgIntellectualProperty.setEvaluationCategory(orgIntellectualProperty.getCatagory() <= 2 ? 1 : 0);
+				res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(orgIntellectualProperty));
+			}
 		}
 		return res;
 	}
@@ -379,11 +391,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteIntellectual", method = RequestMethod.POST)
 	public Result deleteIntellectual(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(orgIntellectualPropertyService.batchDeleteByPrimaryKey(id));
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			res.setData(orgIntellectualPropertyService.batchDeleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -421,19 +433,22 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/techProduct", method = RequestMethod.POST)
 	public Result techProduct(OrgTechProduct orgTechProduct) {
 		Result res = new Result();
-		if (StringUtils.isBlank(orgTechProduct.getId())) {
-			orgTechProduct.setId(UUID.randomUUID().toString());
-			orgTechProduct.setUid(TokenManager.getUserId());
-			orgTechProduct.setDeletedSign(0);
-			Calendar now = Calendar.getInstance();
-			now.set(Calendar.MILLISECOND, 0);
-			orgTechProduct.setCreateTime(now.getTime());
-			orgTechProduct.setYear(Calendar.getInstance().get(Calendar.YEAR) - 1);
-			orgTechProductService.insert(orgTechProduct);
-		} else {
-			orgTechProductService.updateByPrimaryKeySelective(orgTechProduct);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (StringUtils.isBlank(orgTechProduct.getId())) {
+				orgTechProduct.setId(UUID.randomUUID().toString());
+				orgTechProduct.setUid(TokenManager.getUserId());
+				orgTechProduct.setDeletedSign(0);
+				Calendar now = Calendar.getInstance();
+				now.set(Calendar.MILLISECOND, 0);
+				orgTechProduct.setCreateTime(now.getTime());
+				orgTechProduct.setYear(Calendar.getInstance().get(Calendar.YEAR) - 1);
+				orgTechProductService.insert(orgTechProduct);
+			} else {
+				orgTechProductService.updateByPrimaryKeySelective(orgTechProduct);
+			}
+			res.setData(orgTechProduct);
 		}
-		res.setData(orgTechProduct);
 		return res;
 	}
 
@@ -446,11 +461,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteTechProduct", method = RequestMethod.POST)
 	public Result deleteTechProduct(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(orgTechProductService.batchDeleteByPrimaryKey(id));
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			res.setData(orgTechProductService.batchDeleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -483,18 +498,21 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeRatepay", method = RequestMethod.POST)
 	public Result disposeRatepay(OrgRatepay orgRatepay) {
 		Result res = new Result();
-		if (StringUtils.isBlank(orgRatepay.getId())) {
-			if (null == orgRatepayService.selectRatepayByUidAndYear(TokenManager.getUserId(), orgRatepay.getYear())) {
-				orgRatepay.setId(UUID.randomUUID().toString());
-				orgRatepay.setUid(TokenManager.getUserId());
-				orgRatepay.setDeletedSign(0);
-				orgRatepayService.insert(orgRatepay);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (StringUtils.isBlank(orgRatepay.getId())) {
+				if (null == orgRatepayService.selectRatepayByUidAndYear(TokenManager.getUserId(), orgRatepay.getYear())) {
+					orgRatepay.setId(UUID.randomUUID().toString());
+					orgRatepay.setUid(TokenManager.getUserId());
+					orgRatepay.setDeletedSign(0);
+					orgRatepayService.insert(orgRatepay);
+				} else {
+					res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度纳税申报表已录入!"));
+					return res;
+				}
 			} else {
-				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度纳税申报表已录入!"));
-				return res;
+				orgRatepayService.updateByPrimaryKeySelective(orgRatepay);
 			}
-		} else {
-			orgRatepayService.updateByPrimaryKeySelective(orgRatepay);
 		}
 		return res;
 	}
@@ -508,11 +526,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteRatepay", method = RequestMethod.POST)
 	public Result deleteRatepay(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(orgRatepayService.batchDeleteByPrimaryKey(id));
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			res.setData(orgRatepayService.batchDeleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -548,18 +566,21 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeFinance", method = RequestMethod.POST)
 	public Result disposeFinance(OrgFinance orgFinance) {
 		Result res = new Result();
-		if (StringUtils.isBlank(orgFinance.getId())) {
-			if (null == orgFinanceService.selectFinanceByUidAndYear(TokenManager.getUserId(), orgFinance.getYear())) {
-				orgFinance.setId(UUID.randomUUID().toString());
-				orgFinance.setUid(TokenManager.getUserId());
-				orgFinance.setDeletedSign(0);
-				orgFinanceService.insert(orgFinance);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (StringUtils.isBlank(orgFinance.getId())) {
+				if (null == orgFinanceService.selectFinanceByUidAndYear(TokenManager.getUserId(), orgFinance.getYear())) {
+					orgFinance.setId(UUID.randomUUID().toString());
+					orgFinance.setUid(TokenManager.getUserId());
+					orgFinance.setDeletedSign(0);
+					orgFinanceService.insert(orgFinance);
+				} else {
+					res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度财务报表已录入!"));
+					return res;
+				}
 			} else {
-				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度财务报表已录入!"));
-				return res;
+				orgFinanceService.updateByPrimaryKeySelective(orgFinance);
 			}
-		} else {
-			orgFinanceService.updateByPrimaryKeySelective(orgFinance);
 		}
 		return res;
 	}
@@ -573,11 +594,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteFinance", method = RequestMethod.POST)
 	public Result deleteFinance(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(orgFinanceService.batchDeleteByPrimaryKey(id));
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			res.setData(orgFinanceService.batchDeleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -645,13 +666,16 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAchievement", method = RequestMethod.POST)
 	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException {
 		Result res = new Result();
-		if (StringUtils.isBlank(achievement.getId())) {
-			achievement.setId(UUID.randomUUID().toString());
-			achievement.setUid(TokenManager.getUserId());
-			achievement.setDeletedSign(0);
-			orgTechAchievementService.inset(achievement);
-		} else {
-			orgTechAchievementService.updateByPrimaryKeySelective(achievement);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (StringUtils.isBlank(achievement.getId())) {
+				achievement.setId(UUID.randomUUID().toString());
+				achievement.setUid(TokenManager.getUserId());
+				achievement.setDeletedSign(0);
+				orgTechAchievementService.insert(achievement);
+			} else {
+				orgTechAchievementService.updateByPrimaryKeySelective(achievement);
+			}
 		}
 		return res;
 	}
@@ -665,11 +689,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteAchievement", method = RequestMethod.POST)
 	public Result deleteAchievement(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(orgTechAchievementService.batchDeleteByPrimaryKey(id));
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			res.setData(orgTechAchievementService.batchDeleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -706,16 +730,19 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeHonor", method = RequestMethod.POST)
 	public Result disposeHonor(OrgHonorDatum honor, String issuingTimeFormattedDate) throws ParseException {
 		Result res = new Result();
-		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
-			honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, "yyyy-MM-dd"));
-		}
-		if (StringUtils.isBlank(honor.getId())) {
-			honor.setId(UUID.randomUUID().toString());
-			honor.setUid(TokenManager.getUserId());
-			honor.setDeletedSign(0);
-			orgHonorDatumService.inset(honor);
-		} else {
-			orgHonorDatumService.updateByPrimaryKeySelective(honor);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
+				honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, "yyyy-MM-dd"));
+			}
+			if (StringUtils.isBlank(honor.getId())) {
+				honor.setId(UUID.randomUUID().toString());
+				honor.setUid(TokenManager.getUserId());
+				honor.setDeletedSign(0);
+				orgHonorDatumService.insert(honor);
+			} else {
+				orgHonorDatumService.updateByPrimaryKeySelective(honor);
+			}
 		}
 		return res;
 	}
@@ -729,11 +756,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/deleteHonor", method = RequestMethod.POST)
 	public Result deleteHonor(@RequestParam(name = "ids[]", required = true) String[] ids) {
 		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(orgHonorDatumService.batchDeleteByPrimaryKey(id));
+			List<String> id = new ArrayList<String>();
+			for (String s : ids) {
+				id.add(s);
+			}
+			res.setData(orgHonorDatumService.batchDeleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -761,16 +788,19 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeCenter", method = RequestMethod.POST)
 	public Result disposeCenter(OrgTechCenter orgTechCenter, String foundingTimeFormattedDate) throws ParseException {
 		Result res = new Result();
-		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
-			orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, "yyyy-MM-dd"));
-		}
-		if (StringUtils.isBlank(orgTechCenter.getId())) {
-			orgTechCenter.setId(UUID.randomUUID().toString());
-			orgTechCenter.setUid(TokenManager.getUserId());
-			orgTechCenter.setDeletedSign(0);
-			orgTechCenterService.insert(orgTechCenter);
-		} else {
-			orgTechCenterService.updateByPrimaryKeySelective(orgTechCenter);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
+				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, "yyyy-MM-dd"));
+			}
+			if (StringUtils.isBlank(orgTechCenter.getId())) {
+				orgTechCenter.setId(UUID.randomUUID().toString());
+				orgTechCenter.setUid(TokenManager.getUserId());
+				orgTechCenter.setDeletedSign(0);
+				orgTechCenterService.insert(orgTechCenter);
+			} else {
+				orgTechCenterService.updateByPrimaryKeySelective(orgTechCenter);
+			}
 		}
 		return res;
 	}
@@ -783,7 +813,6 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/centerDetail", method = RequestMethod.POST)
 	public Result centerDetail(String pageNo, String pageSize, String cid) {
 		Result res = new Result();
-		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
 			if (StringUtils.isNumeric(pageSize)) {
@@ -793,7 +822,6 @@ public class CognizanceApiController extends BaseApiController {
 				pNo = Integer.parseInt(pageNo);
 			}
 			res.setData(orgTechCenterDetailService.listOrgTechCenterDetail(pNo, pSize, cid));
-		}
 		return res;
 	}
 
@@ -810,19 +838,19 @@ public class CognizanceApiController extends BaseApiController {
 	public Result disposeCenterDetail(OrgTechCenterDetail orgTechCenterDetail, String projectTimeFormattedDate,
 			String termTimeFormattedDate) throws ParseException {
 		Result res = new Result();
-		if (!StringUtils.isBlank(projectTimeFormattedDate)) {
-			orgTechCenterDetail.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, "yyyy-MM-dd"));
-		}
-		if (!StringUtils.isBlank(termTimeFormattedDate)) {
-			orgTechCenterDetail.setTermTime(DateUtils.parseDate(termTimeFormattedDate, "yyyy-MM-dd"));
-		}
-		if (StringUtils.isBlank(orgTechCenterDetail.getId())) {
-			orgTechCenterDetail.setId(UUID.randomUUID().toString());
-			orgTechCenterDetail.setDeletedSign(0);
-			orgTechCenterDetailService.inset(orgTechCenterDetail);
-		} else {
-			orgTechCenterDetailService.updateByPrimaryKeySelective(orgTechCenterDetail);
-		}
+			if (!StringUtils.isBlank(projectTimeFormattedDate)) {
+				orgTechCenterDetail.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, "yyyy-MM-dd"));
+			}
+			if (!StringUtils.isBlank(termTimeFormattedDate)) {
+				orgTechCenterDetail.setTermTime(DateUtils.parseDate(termTimeFormattedDate, "yyyy-MM-dd"));
+			}
+			if (StringUtils.isBlank(orgTechCenterDetail.getId())) {
+				orgTechCenterDetail.setId(UUID.randomUUID().toString());
+				orgTechCenterDetail.setDeletedSign(0);
+				orgTechCenterDetailService.inset(orgTechCenterDetail);
+			} else {
+				orgTechCenterDetailService.updateByPrimaryKeySelective(orgTechCenterDetail);
+			}
 		return res;
 	}
 
@@ -865,16 +893,19 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/listCognizance", method = RequestMethod.POST)
 	public Result listCognizance(String locationProvince, String pageNo, String pageSize) {
 		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			Integer pNo = 1;
+			Integer pSize = 10;
+			if (StringUtils.isNumeric(pageSize)) {
+				pSize = Integer.parseInt(pageSize);
+			}
+			if (StringUtils.isNumeric(pageNo)) {
+				pNo = Integer.parseInt(pageNo);
+			}
+			res.setData(orgCognizanceService.listCognizance(TokenManager.getUserId(), locationProvince, pNo, pSize));
 		}
-
-		res.setData(orgCognizanceService.listCognizance(TokenManager.getUserId(), locationProvince, pNo, pSize));
+		
 		return res;
 	}
 
@@ -886,13 +917,14 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/applyCognizance", method = RequestMethod.POST)
 	public Result applyCognizance(Integer contacts, String comment, Integer year, Integer state) {
 		Result res = new Result();
-		if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, TokenManager.getUserId())){
-			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, TokenManager.getUserId())){
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
+			}
+			String aid = TokenManager.getToken().getAid();
+			orgCognizanceService.insertCognizance(contacts, comment, year,  state, aid, TokenManager.getUserId());
 		}
-		String aid = TokenManager.getToken().getAid();
-		orgCognizanceService.insertCognizance(contacts, comment, year,  state, aid, TokenManager.getUserId());
-		
-		
 		return res;
 	}
 
@@ -906,7 +938,10 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/cognizanceDetail", method = RequestMethod.POST)
 	public Result cognizanceDetail(String cid, Integer year) {
 		Result res = new Result();
-		res.setData(handleCognizanceDetail(TokenManager.getUserId(), cid, year));
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			res.setData(handleCognizanceDetail(TokenManager.getUserId(), cid, year));
+		}
 		return res;
 	}
 	
@@ -919,8 +954,11 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/cognizanceLog", method = RequestMethod.POST)
 	public Result cognizanceLog(String cid) {
 		Result res = new Result();
-		List<OrgCognizanceLog> list = orgCognizanceLogService.selectOrgCognizanceLogByCid(cid);
-		res.setData(list);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			List<OrgCognizanceLog> list = orgCognizanceLogService.selectOrgCognizanceLogByCid(cid);
+			res.setData(list);
+		}
 		return res;
 	}
 	
@@ -930,7 +968,10 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeCognizanceDetail", method = RequestMethod.POST)
 	public Result disposeCognizanceDetail(OrgCognizance cog){
 		Result res = new Result();
-		orgCognizanceService.updateByPrimaryKeySelective(cog);
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			orgCognizanceService.updateByPrimaryKeySelective(cog);
+		}
 		return res;
 	}
 
@@ -967,7 +1008,10 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/annualReportDetail", method = RequestMethod.POST)
 	public Result annualReportDetail(Integer year) {
 		Result res = new Result();
-		res.setData(handleAnnualReport(TokenManager.getUserId(), year));
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			res.setData(handleAnnualReport(TokenManager.getUserId(), year));
+		}
 		return res;
 	}
 
@@ -980,26 +1024,29 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAnnualReport", method = RequestMethod.POST)
 	public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport) {
 		Result res = new Result();
-		if (StringUtils.isBlank(orgAnnualReport.getId())) {
-			if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(),
-					TokenManager.getUserId())) {
-				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年企业年报已录入!"));
-				return res;
-			} 
-				orgAnnualReport.setId(UUID.randomUUID().toString());
-				orgAnnualReport.setUid(TokenManager.getUserId());
+		res = checkCertify(res);
+		if (res.getError().isEmpty()) {
+			if (StringUtils.isBlank(orgAnnualReport.getId())) {
+				if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(),
+						TokenManager.getUserId())) {
+					res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年企业年报已录入!"));
+					return res;
+				} 
+					orgAnnualReport.setId(UUID.randomUUID().toString());
+					orgAnnualReport.setUid(TokenManager.getUserId());
+					Calendar now = Calendar.getInstance();
+					now.set(Calendar.MILLISECOND, 0);
+					orgAnnualReport.setCreateTime(now.getTime());
+					orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
+					orgAnnualReport.setDeletedSign(0);
+					orgAnnualReportService.insert(orgAnnualReport);
+				
+			} else {
 				Calendar now = Calendar.getInstance();
 				now.set(Calendar.MILLISECOND, 0);
-				orgAnnualReport.setCreateTime(now.getTime());
-				orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
-				orgAnnualReport.setDeletedSign(0);
-				orgAnnualReportService.insert(orgAnnualReport);
-			
-		} else {
-			Calendar now = Calendar.getInstance();
-			now.set(Calendar.MILLISECOND, 0);
-			orgAnnualReport.setLastUpdateTime(now.getTime());
-			orgAnnualReportService.updateByPrimaryKeySelective(orgAnnualReport);
+				orgAnnualReport.setLastUpdateTime(now.getTime());
+				orgAnnualReportService.updateByPrimaryKeySelective(orgAnnualReport);
+			}
 		}
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgHonorDatumService.java

@@ -9,7 +9,7 @@ public interface OrgHonorDatumService {
 
 	Pagination<OrgHonorDatum> listOrgHonorDatum(Integer pNo, Integer pSize, String userId);
 
-	OrgHonorDatum inset(OrgHonorDatum honor);
+	OrgHonorDatum insert(OrgHonorDatum honor);
 
 	int updateByPrimaryKeySelective(OrgHonorDatum honor);
 

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgTechAchievementService.java

@@ -9,7 +9,7 @@ public interface OrgTechAchievementService {
 
 	Pagination<OrgTechAchievement> listOrgTechAchievement(Integer pNo, Integer pSize, String userId);
 
-	OrgTechAchievement inset(OrgTechAchievement achievement);
+	OrgTechAchievement insert(OrgTechAchievement achievement);
 
 	int updateByPrimaryKeySelective(OrgTechAchievement achievement);
 

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgHonorDatumServiceImpl.java

@@ -39,7 +39,7 @@ public class OrgHonorDatumServiceImpl extends BaseMybatisDao<OrgHonorDatumMapper
 	}
 
 	@Override
-	public OrgHonorDatum inset(OrgHonorDatum honor) {
+	public OrgHonorDatum insert(OrgHonorDatum honor) {
 		orgHonorDatumMapper.insert(honor);
 		return honor;
 	}

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgTechAchievementServiceImpl.java

@@ -39,7 +39,7 @@ public class OrgTechAchievementServiceImpl extends BaseMybatisDao<OrgTechAchieve
 	}
 
 	@Override
-	public OrgTechAchievement inset(OrgTechAchievement achievement) {
+	public OrgTechAchievement insert(OrgTechAchievement achievement) {
 		orgTechAchievementMapper.insert(achievement);
 		return achievement;
 	}

+ 5 - 0
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -32,6 +32,9 @@ public class BaseController {
 	@Value(value = "${static.host}")
 	private String staticHost = null;
 	
+	@Value(value = "${avatar.host}")
+	private String avatarHost = null;
+	
 	@Value(value = "${upload.path}")
 	private String uploadPath = null;
 	
@@ -76,6 +79,7 @@ public class BaseController {
 	protected Error buildErrorByMsg(String msg, Object... params) {
 		return new Error(MessageFormat.format(msg, params));
 	}
+	
 
 	@InitBinder
 	public void initBinder(WebDataBinder binder) {
@@ -88,6 +92,7 @@ public class BaseController {
 	public void prepareModel(HttpServletRequest request, Model model) {
 		
 		model.addAttribute("staticHost", staticHost);
+		model.addAttribute("avatarHost", avatarHost);
 		model.addAttribute("basePath", request.getContextPath());
 		model.addAttribute("uploadPath",uploadPath);
 		model.addAttribute("uploadPrivatePath",uploadPrivatePath);

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrgAnnualReportMapper.xml

@@ -177,7 +177,7 @@
 	<if test="uid != null">
 		and uid = #{uid,jdbcType=VARCHAR}
 	</if>
-	order by create_time desc
+	order by year desc
     <if test="page_sql != null">
     	${page_sql}
     </if>

+ 4 - 2
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -23,6 +23,7 @@
     <result column="number" jdbcType="INTEGER" property="number"/>
     <result column="type" jdbcType="INTEGER" property="type"/>
     <result column="person_portrait_url" jdbcType="VARCHAR" property="personPortraitUrl"/>
+    <result column="logo_url" jdbcType="VARCHAR" property="logoUrl"/>
   </resultMap>
   
   <resultMap type="com.goafanti.user.bo.UserDownLoadBo" id="UserDownLoadBo">
@@ -180,8 +181,9 @@
   </select>
   
   <select id="selectUserPageHomeBoByUserId" resultMap="UserPageHomeBo" parameterType="java.lang.String">
-   select u.lvl,u.nickname,u.email,u.number,u.type,i.person_portrait_url, o.logo_url ,i.id ,i.uid from user u LEFT JOIN user_info  i 
-   on u.id = i.uid 
+   select u.lvl,u.nickname,u.email,u.number,u.type,i.person_portrait_url, o.logo_url ,i.id ,u.id as uid 
+   from user u 
+   LEFT JOIN user_info  i on u.id = i.uid 
    LEFT JOIN organization_info o on u.id = o.uid where u.id = #{uid,jdbcType = VARCHAR}
   </select>
   

+ 7 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -884,7 +884,9 @@ public class UserApiController extends BaseApiController {
 			user.setId(u.getId());
 			user.setUid(u.getUid());
 			user.setProcess(0);
+			user.setWrongCount(0);
 			user.setAmountMoney(new BigDecimal(0));
+			user.setAuditStatus(0);
 			res.setData(userIdentityService.updateByPrimaryKey(user));
 		} else {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
@@ -892,6 +894,8 @@ public class UserApiController extends BaseApiController {
 			org.setId(o.getId());
 			org.setUid(o.getUid());
 			org.setProcess(0);
+			org.setWrongCount(0);
+			org.setAuditStatus(0);
 			org.setValidationAmount(new BigDecimal(0));
 			res.setData(organizationIdentityService.updateByPrimaryKey(org));
 		}
@@ -956,9 +960,11 @@ public class UserApiController extends BaseApiController {
 	
 	// 判断用户是否通过认证
 		private Result checkCertify(Result res) {
-			if (5 != organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId()).getAuditStatus()) {
+			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
+			if (null == o || 5 != o.getAuditStatus()) {
 				res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
 			}
+			
 			return res;
 		}
 	

+ 2 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -75,7 +75,7 @@ public class UserRegisterController extends BaseController {
 		} else if (StringUtils.isBlank(user.getPassword())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "必须指定", "密码"));
 		} else {
-			User u = userService.selectByMobieAndType(user.getMobile(), user.getType());
+			User u = userService.selectByMobieAndType(user.getMobile().trim(), user.getType());
 			if (null != u) {
 				if (u.getMobile().equals(user.getMobile()) && u.getType() == user.getType()) {
 					res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "用户名已存在"));
@@ -99,5 +99,6 @@ public class UserRegisterController extends BaseController {
 
 		return res;
 	}
+	
 
 }

+ 12 - 10
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -55,16 +55,18 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	public Map<String, String> selectContactsByUserId(String uid) {
 		OrganizationIdentity i = organizationIdentityMapper.selectOrgIdentityByUserId(uid);
 		Map<String, String> map = new TreeMap<String, String>();
-		if (!StringUtils.isBlank(i.getFirstContacts()) && !StringUtils.isBlank(i.getFirstMobile())) {
-			map.put("1", i.getFirstContacts() + "  " + i.getFirstMobile());
-		}
-
-		if (!StringUtils.isBlank(i.getSecondContacts()) && !StringUtils.isBlank(i.getSecondMobile())) {
-			map.put("2", i.getSecondContacts() + "  " + i.getSecondMobile());
-		}
-
-		if (!StringUtils.isBlank(i.getThirdContacts()) && !StringUtils.isBlank(i.getThirdMobile())) {
-			map.put("3", i.getThirdContacts() + "  " + i.getThirdMobile());
+		if (null != i){
+			if (!StringUtils.isBlank(i.getFirstContacts()) && !StringUtils.isBlank(i.getFirstMobile())) {
+				map.put("1", i.getFirstContacts() + "  " + i.getFirstMobile());
+			}
+	
+			if (!StringUtils.isBlank(i.getSecondContacts()) && !StringUtils.isBlank(i.getSecondMobile())) {
+				map.put("2", i.getSecondContacts() + "  " + i.getSecondMobile());
+			}
+	
+			if (!StringUtils.isBlank(i.getThirdContacts()) && !StringUtils.isBlank(i.getThirdMobile())) {
+				map.put("3", i.getThirdContacts() + "  " + i.getThirdMobile());
+			}
 		}
 		return map;
 	}

+ 4 - 2
src/main/resources/props/config_dev.properties

@@ -51,10 +51,12 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.7
+static.host=//afts.hnzhiming.com/1.0.8
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload
 
 accessKey=LTAIqTgQLLwz252Z
-accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+
+avatar.host=//afts.hnzhiming.com

+ 3 - 1
src/main/resources/props/config_local.properties

@@ -53,10 +53,12 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.7
+static.host=//afts.hnzhiming.com/1.0.8
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc
 
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+
+avatar.host=//afts.hnzhiming.com

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.7
+static.host=//afts.hnzhiming.com/1.0.8

+ 4 - 2
src/main/resources/props/config_test.properties

@@ -53,10 +53,12 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.7
+static.host=//aftts.hnzhiming.com/1.0.8
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload
 
 accessKey=LTAIqTgQLLwz252Z
-accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+
+avatar.host=//aftts.hnzhiming.com

+ 2 - 1
src/main/webapp/WEB-INF/views/header.jsp

@@ -33,7 +33,8 @@
 		context : "${basePath}",
 		staticHost : "${staticHost}",
 		uploadPath : "${uploadPath}",
-		uploadPrivatePath : "${uploadPrivatePath}"
+		uploadPrivatePath : "${uploadPrivatePath}",
+		avatarHost : "${avatarHost}"
 	}
 
 	<c:if test="${not empty adminData}">