Antiloveg 8 years ago
parent
commit
581adc210f

+ 1 - 0
schema/permission.sql

@@ -134,6 +134,7 @@ values
 insert into `permission`(`id`, `url`, `name`) 
 values 
 (UUID(), 'api/admin/listCognizance', '高企认定--高企认定列表'), 
+(UUID(), 'api/admin/listCognizance', '高企认定--咨询师下拉列表'), 
 (UUID(), 'api/admin/applyCognizance', '高企认定--申请高企认定	'), 
 (UUID(), 'api/admin/cognizanceDetail', '高企认定--高企认定详情'), 
 (UUID(), 'api/admin/cognizanceStatus', '高企认定--高企认定流转状态下拉'),

+ 29 - 282
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -172,9 +172,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/adminInfo", method = RequestMethod.GET)
 	public Result adminInfo() {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
 			return res;
@@ -193,9 +190,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/updateAdminInfo", method = RequestMethod.POST)
 	public Result updateAdminInfo(@Valid InputAdmin admin, String pwd, BindingResult bindingResult) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
@@ -267,9 +261,6 @@ public class AdminApiController extends CertifyApiController {
 	public Result adminList(String province, Integer number, String mobile, String name, String pageNo,
 			String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -299,10 +290,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(admin.getMobile())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
 			return res;
@@ -370,9 +357,6 @@ public class AdminApiController extends CertifyApiController {
 					AdminFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (null == admin.getId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
@@ -422,9 +406,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/resetPwd", method = RequestMethod.POST)
 	public Result resetPwd(String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
 			return res;
@@ -455,9 +436,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/addNewUser", method = RequestMethod.POST)
 	public Result addNewUser(String mobile, Integer type, String unitName) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(mobile)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "mobile", "mobile"));
@@ -508,9 +486,6 @@ public class AdminApiController extends CertifyApiController {
 			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number,
 			String aftUsername, Integer auditStatus, String pageNo, String pageSize) throws ParseException {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -532,9 +507,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/userDetail", method = RequestMethod.POST)
 	public Result userDetail(String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -561,10 +533,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (null == userIdentity.getUid()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -609,9 +577,6 @@ public class AdminApiController extends CertifyApiController {
 			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number, String unitName,
 			Integer auditStatus, String pageNo, String pageSize) throws ParseException {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -633,9 +598,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/orgDetail", method = RequestMethod.POST)
 	public Result orgDetail(String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -662,10 +624,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (null == orgIdentity.getUid()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -704,9 +662,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/orgHumanResource", method = RequestMethod.POST)
 	public Result orgHumanResource(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -743,10 +698,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(orgHumanResource.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -788,9 +739,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadRoster", method = RequestMethod.POST)
 	public Result uploadRoster(HttpServletRequest req, String sign, String uid, String year) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(year)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示年份"));
@@ -824,9 +772,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadSocialSecurity", method = RequestMethod.POST)
 	public Result uploadSocialSecurity(HttpServletRequest req, String sign, String uid, String year) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(year)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示年份"));
@@ -860,9 +805,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadHumanResource", method = RequestMethod.GET)
 	public Result downloadHumanResource(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业人员情况id"));
 			return res;
@@ -896,9 +838,6 @@ public class AdminApiController extends CertifyApiController {
 	public Result standard(String uid, String standardName, String standardNumber, Integer standardLevel,
 			Integer participateWay, String pageNo, String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -936,9 +875,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(orgStandard.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -974,9 +910,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteStandard", method = RequestMethod.POST)
 	public Result deleteStandard(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -995,9 +928,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/intellectualList", method = RequestMethod.POST)
 	public Result intellectualList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -1035,9 +965,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(orgIntellectualProperty.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -1078,9 +1005,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadPropertyRight", method = RequestMethod.POST)
 	public Result uploadPropertyRight(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -1108,9 +1032,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadPropertyRight", method = RequestMethod.GET)
 	public Result downloadPropertyRight(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权id"));
 			return res;
@@ -1140,9 +1061,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteIntellectual", method = RequestMethod.POST)
 	public Result deleteIntellectual(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -1161,9 +1079,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/techProductList", method = RequestMethod.POST)
 	public Result techProductList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -1200,10 +1115,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(orgTechProduct.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -1241,9 +1152,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadTecProduct", method = RequestMethod.POST)
 	public Result uploadTecProduct(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -1271,9 +1179,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadTecProduct", method = RequestMethod.GET)
 	public Result downloadTecProduct(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高新技术产品id"));
 			return res;
@@ -1303,9 +1208,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteTechProduct", method = RequestMethod.POST)
 	public Result deleteTechProduct(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -1330,9 +1232,6 @@ public class AdminApiController extends CertifyApiController {
 	public Result activityList(String activityNumber, String activityName, String startDateFormattedDate,
 			String endDateFormattedDate, String pageNo, String pageSize, String uid) throws ParseException {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 		}
@@ -1370,10 +1269,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(orgActivity.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -1420,9 +1315,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadProof", method = RequestMethod.POST)
 	public Result uploadProof(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -1450,9 +1342,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadProof", method = RequestMethod.GET)
 	public Result downloadProof(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
 			return res;
@@ -1482,9 +1371,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteActivity", method = RequestMethod.POST)
 	public Result deleteActivity(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -1504,9 +1390,6 @@ public class AdminApiController extends CertifyApiController {
 	public Result activityCostList(String activityNumber, String startDateFormattedDate, String endDateFormattedDate,
 			String pageNo, String pageSize, String uid) throws ParseException {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -1546,10 +1429,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(orgActivityCost.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -1596,9 +1475,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadActivityCost", method = RequestMethod.POST)
 	public Result uploadActivityCost(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -1626,9 +1502,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadActivityCost", method = RequestMethod.GET)
 	public Result downloadActivityCost(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", " 研发活动费用id"));
 			return res;
@@ -1658,9 +1531,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteActivityCost", method = RequestMethod.POST)
 	public Result deleteActivityCost(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -1678,9 +1548,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/activityNumber", method = RequestMethod.POST)
 	public Result listActivityNumber(String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -1700,9 +1567,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/ratepay", method = RequestMethod.POST)
 	public Result ratepay(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -1737,9 +1601,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(orgRatepay.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -1783,9 +1644,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadRatepay", method = RequestMethod.POST)
 	public Result uploadRatepay(HttpServletRequest req, String sign, String uid, String year) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -1819,9 +1677,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadRatepay", method = RequestMethod.GET)
 	public Result downloadRatepay(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
 			return res;
@@ -1851,9 +1706,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteRatepay", method = RequestMethod.POST)
 	public Result deleteRatepay(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -1870,9 +1722,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/finance", method = RequestMethod.POST)
 	public Result finance(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -1909,10 +1758,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(orgFinance.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -1956,9 +1801,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadFinance", method = RequestMethod.POST)
 	public Result uploadFinance(HttpServletRequest req, String sign, String uid, String year) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(year)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示年份"));
@@ -1992,9 +1834,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadFinance", method = RequestMethod.GET)
 	public Result downloadFinance(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业财务报表id"));
 			return res;
@@ -2024,9 +1863,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteFinance", method = RequestMethod.POST)
 	public Result deleteFinance(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -2045,9 +1881,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/achievementList", method = RequestMethod.POST)
 	public Result achievementList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -2085,10 +1918,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(achievement.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -2121,9 +1950,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadAchievement", method = RequestMethod.POST)
 	public Result uploadAchievement(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -2151,9 +1977,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadAchievement", method = RequestMethod.GET)
 	public Result downloadAchievement(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果id"));
 			return res;
@@ -2183,9 +2006,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteAchievement", method = RequestMethod.POST)
 	public Result deleteAchievement(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -2202,9 +2022,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/honorList", method = RequestMethod.POST)
 	public Result honorList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -2243,9 +2060,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(honor.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -2285,9 +2099,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadHonor", method = RequestMethod.POST)
 	public Result uploadHonor(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -2315,9 +2126,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadHonor", method = RequestMethod.GET)
 	public Result downloadHonor(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "荣誉及其他证明材料id"));
 			return res;
@@ -2347,9 +2155,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteHonor", method = RequestMethod.POST)
 	public Result deleteHonor(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -2366,9 +2171,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/center", method = RequestMethod.POST)
 	public Result center(String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -2397,10 +2199,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(orgTechCenter.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -2439,9 +2237,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadInstitution", method = RequestMethod.POST)
 	public Result uploadInstitution(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -2469,9 +2264,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadInstitution", method = RequestMethod.GET)
 	public Result downloadInstitution(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发部门id"));
 			return res;
@@ -2500,9 +2292,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/centerDetail", method = RequestMethod.GET)
 	public Result centerDetail(String pageNo, String pageSize, String cid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(cid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "技术中心ID"));
@@ -2541,10 +2330,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (!StringUtils.isBlank(projectTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
@@ -2592,9 +2377,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadProtocol", method = RequestMethod.POST)
 	public Result uploadProtocol(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (null == uid) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
@@ -2627,9 +2409,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadProtocol", method = RequestMethod.GET)
 	public Result downloadProtocol(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "产学研技术中心id"));
 			return res;
@@ -2660,9 +2439,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteOrgTechCenterDetail", method = RequestMethod.POST)
 	public Result deleteOrgTechCenterDetail(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -2679,9 +2455,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/getContacts", method = RequestMethod.GET)
 	public Result getContacts(String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -2715,9 +2488,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/listCognizance", method = RequestMethod.POST)
 	public Result listCognizance(String uid, String unitName, String locationProvince, String pageNo, String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -2730,6 +2500,22 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgCognizanceService.listCognizance(uid, unitName, locationProvince, pNo, pSize));
 		return res;
 	}
+	
+	/**
+	 * 高企认定咨询师下拉列表
+	 * @return
+	 */
+	@RequestMapping(value = "/getConsultant", method = RequestMethod.GET)
+	public Result getConsultant(){
+		Result res = new Result();
+		List<Admin> list = adminService.selectConsultant();
+		Map<String, String> map = new TreeMap<String, String>();
+		for (Admin o : list) {
+			map.put(o.getId(), o.getName());
+		}
+		res.setData(map);
+		return res;
+	}
 
 	/**
 	 * 申请高企认定
@@ -2746,9 +2532,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(cog.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -2789,9 +2572,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/cognizanceDetail", method = RequestMethod.POST)
 	public Result cognizanceDetail(String uid, String cid, Integer year) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -2822,9 +2602,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/cognizanceStatus", method = RequestMethod.GET)
 	public Result cognizanceStatus() {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		res.setData(disposeCognizanceStatus());
 		return res;
 	}
@@ -2838,9 +2615,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/cognizanceLog", method = RequestMethod.POST)
 	public Result cognizanceLog(String cid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(cid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "高企ID"));
@@ -2866,9 +2640,6 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(cog.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -2903,9 +2674,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteCognizance", method = RequestMethod.POST)
 	public Result deleteCognizance(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
@@ -2924,9 +2692,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/able", method = RequestMethod.POST)
 	public Result able(String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -3077,9 +2842,6 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteAnnualReport", method = RequestMethod.POST)
 	public Result deleteAnnualReport(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
@@ -3111,34 +2873,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	/**
-	 * 高企相关材料上传
-	 * 
-	 * @param req
-	 * @param sign
-	 * @param uid
-	 * @return
-	 */
-	@RequestMapping(value = "/upload", method = RequestMethod.POST)
-	public Result cognizanceFile(HttpServletRequest req, String sign, String uid) {
-		Result res = new Result();
-		if (!checkUserLogin(res)) {
-			return res;
-		}
-
-		if (StringUtils.isBlank(uid)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
-			return res;
-		}
-		res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
-		return res;
-	}
-
-	/**
-	 * 
-	 * @return
-	 */
-
 	// 判断用户是否通过认证
 	private Result checkCertify(Result res, String uid) {
 		OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(uid);
@@ -3226,4 +2960,17 @@ public class AdminApiController extends CertifyApiController {
 		return status;
 	}
 
+	/*
+	 * 高企相关材料上传
+	 * 
+	 * @RequestMapping(value = "/upload", method = RequestMethod.POST) public
+	 * Result cognizanceFile(HttpServletRequest req, String sign, String uid) {
+	 * Result res = new Result();
+	 * 
+	 * if (StringUtils.isBlank(uid)) {
+	 * res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户",
+	 * "用户")); return res; } res.setData(handleFiles(res, "/cognizance/", true,
+	 * req, sign, uid)); return res; }
+	 */
+
 }

+ 0 - 11
src/main/java/com/goafanti/admin/controller/AdminNoticeApiController.java

@@ -26,11 +26,6 @@ public class AdminNoticeApiController extends CertifyApiController{
 	@RequestMapping(value = "/unreadCount", method = RequestMethod.GET)
 	public Result unreadCount(){
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-		
-		
 		res.setData(noticeService.findUnreadNoticeCount());
 		return res;
 	}
@@ -43,9 +38,6 @@ public class AdminNoticeApiController extends CertifyApiController{
 	@RequestMapping(value = "/unread", method = RequestMethod.GET)
 	public Result unread(String pageNo, String pageSize){
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -66,9 +58,6 @@ public class AdminNoticeApiController extends CertifyApiController{
 	@RequestMapping(value = "/readed", method = RequestMethod.GET)
 	public Result readed(String pageNo, String pageSize){
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -25,4 +25,6 @@ public interface AdminService {
 
 	AdminDetail selectAdminDetail(String id);
 
+	List<Admin> selectConsultant();
+
 }

+ 5 - 0
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -118,4 +118,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		return null;
 	}
 
+	@Override
+	public List<Admin> selectConsultant() {
+		return adminMapper.selectConsultant();
+	}
+
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -23,4 +23,6 @@ public interface AdminMapper {
 	Admin selectByMobile(String mobile);
 
 	List<Role> selectRolesByPrimaryKey(String uid);
+
+	List<Admin> selectConsultant();
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -186,4 +186,11 @@
     where ur.uid = #{uid,jdbcType=VARCHAR}
   </select>
   
+  <select id="selectConsultant" resultMap="BaseResultMap"  >
+    select 
+    <include refid="Base_Column_List" />
+    from admin
+    where id  <![CDATA[ <> ]]> '1'
+  </select>
+  
 </mapper>

+ 10 - 2
src/main/java/com/goafanti/core/shiro/filter/LoginFilter.java

@@ -39,11 +39,19 @@ public class LoginFilter extends AccessControlFilter {
 			uri = uri.replaceAll("^\\" + basePath + "\\/+", "").replaceAll("\\.html$", "");
 		}
 
-		if (token != null && uri.startsWith("admin/") && token instanceof Admin) {
+		if (token != null && uri.startsWith("api/admin/") && token instanceof Admin) {
 			return Boolean.TRUE;
 		}
 
-		if (token != null && uri.startsWith("user/") && token instanceof User) {
+		if (token != null && uri.startsWith("techservice/") && token instanceof User) {
+			return Boolean.TRUE;
+		}
+		
+		if (token != null && uri.startsWith("api/techproject/") && token instanceof User) {
+			return Boolean.TRUE;
+		}
+		
+		if (token != null && uri.startsWith("api/user/") && token instanceof User) {
 			return Boolean.TRUE;
 		}
 

+ 1 - 1
src/main/resources/shiro_base_auth.ini

@@ -6,7 +6,7 @@
 /open/**=anon
 /favicon.ico=anon
 /static/**=anon
-/api/admin/**=permission
+/api/admin/**=login,permission
 /api/user/**=login
 /api/techproject/**=login
 /techservice/**=login