Antiloveg лет назад: 8
Родитель
Сommit
6e886d934a

+ 1 - 0
schema/permission.sql

@@ -128,6 +128,7 @@ values
 
 insert into `permission`(`id`, `url`, `name`) 
 values 
+(UUID(), 'api/admin/getUnitNames', '获取公司'),
 (UUID(), 'api/admin/getContacts', '获取公司联系人');
 
 insert into `permission`(`id`, `url`, `name`) 

+ 8 - 6
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -1,14 +1,16 @@
 package com.goafanti.admin.bo;
 
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import com.goafanti.common.constant.ErrorConstants;
 
 public class InputAdmin {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String id;
-	
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	id;
+
+	@Size(min = 0, max = 11, message = "{" + ErrorConstants.MOBILE_SIZE_ERROR + "}")
+	@Pattern(regexp = "^([1-9])\\d{10}$", message = "{" + ErrorConstants.MOBILE_PATTERN_ERROR + "}")
 	private String	mobile;
 
 	@Size(min = 0, max = 6, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -17,13 +19,13 @@ public class InputAdmin {
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	password;
 
-	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
+	@Pattern(regexp = "^([a-z0-9A-Z]+[_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$", message = "{"
+			+ ErrorConstants.EMAIL_PATTERN_ERROR + "}")
 	private String	email;
 
 	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	province;
-	
-	
 
 	public String getId() {
 		return id;

+ 112 - 115
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -162,16 +162,15 @@ public class AdminApiController extends CertifyApiController {
 	private AdminService					adminService;
 	@Resource
 	private OrgTechCenterDetailService		orgTechCenterDetailService;
-	
-	
-	
+
 	/**
 	 * 管理员本人信息详情
+	 * 
 	 * @param id
 	 * @return
 	 */
 	@RequestMapping(value = "/adminInfo", method = RequestMethod.GET)
-	public Result adminInfo(){
+	public Result adminInfo() {
 		Result res = new Result();
 		if (!checkAdminLogin(res)) {
 			return res;
@@ -183,36 +182,37 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(adminService.selectByPrimaryKey(TokenManager.getAdminId()));
 		return res;
 	}
-	
+
 	/**
 	 * 管理员修改本人信息
+	 * 
 	 * @param admin
 	 * @param bindingResult
 	 * @return
 	 */
 	@RequestMapping(value = "/updateAdminInfo", method = RequestMethod.POST)
-	public Result updateAdminInfo(@Valid InputAdmin admin, String pwd, BindingResult bindingResult){
+	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, "", "超级管理员"));
 			return res;
 		}
-		
+
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					AdminFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		
-		if (StringUtils.isBlank(admin.getId())){
+
+		if (StringUtils.isBlank(admin.getId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(admin.getMobile())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
 			return res;
@@ -222,26 +222,26 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
 			return res;
 		}
-		
+
 		Admin a = adminService.selectByMobile(admin.getMobile().trim());
 		if (!TokenManager.getAdminId().equals(a.getId())) {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 			return res;
 		}
-		
+
 		Admin ad = new Admin();
 		BeanUtils.copyProperties(admin, ad);
 		Admin aa = adminService.selectByPrimaryKey(TokenManager.getAdminId());
 		ad.setMobile(ad.getMobile().trim());
 		ad.setCreateTime(aa.getCreateTime());
-		
-		if (!StringUtils.isBlank(ad.getPassword())){
-			if (StringUtils.isBlank(pwd)){
+
+		if (!StringUtils.isBlank(ad.getPassword())) {
+			if (StringUtils.isBlank(pwd)) {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "原密码"));
 				return res;
 			}
 			if (!aa.getPassword().equals(passwordUtil.getEncryptPwd(pwd, aa.getCreateTime()))) {
-				res.getError().add(buildError(ErrorConstants.PWD_NOT_MATCH_ERROR,"","原密码"));
+				res.getError().add(buildError(ErrorConstants.PWD_NOT_MATCH_ERROR, "", "原密码"));
 				return res;
 			}
 		} else {
@@ -251,8 +251,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(adminService.updateByPrimaryKey(ad));
 		return res;
 	}
-	
-	
+
 	/**
 	 * 管理员列表
 	 * 
@@ -282,10 +281,6 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(adminService.listAdmin(province, number, mobile, name, pNo, pSize));
 		return res;
 	}
-	
-	
-
-	
 
 	/**
 	 * 新增管理员
@@ -317,7 +312,6 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
 			return res;
 		}
-		
 
 		Admin a = adminService.selectByMobile(admin.getMobile().trim());
 		if (null != a) {
@@ -331,7 +325,7 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(admin, ad);
 		ad.setId(UUID.randomUUID().toString());
 		ad.setCreateTime(now.getTime());
-		if (StringUtils.isBlank(ad.getPassword())){
+		if (StringUtils.isBlank(ad.getPassword())) {
 			ad.setPassword("123456");
 		}
 		ad.setPassword(passwordUtil.getEncryptPwd(ad));
@@ -339,21 +333,22 @@ public class AdminApiController extends CertifyApiController {
 
 		return res;
 	}
-	
+
 	/**
 	 * 管理员详情
+	 * 
 	 * @param id
 	 * @return
 	 */
 	@RequestMapping(value = "/adminDetail", method = RequestMethod.GET)
-	public Result adminDetail(String id){
+	public Result adminDetail(String id) {
 		Result res = new Result();
-		
-		if (StringUtils.isBlank(id)){
+
+		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
 			return res;
 		}
-		
+
 		AdminDetail ad = adminService.selectAdminDetail(id);
 		res.setData(ad);
 		return res;
@@ -393,24 +388,26 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
 			return res;
 		}
-		
+
 		Admin aa = adminService.selectByMobile(admin.getMobile().trim());
-		if (!admin.getId().equals(aa.getId()) ){
+		if (!admin.getId().equals(aa.getId())) {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 			return res;
 		}
-		
+
 		Admin a = adminService.selectByPrimaryKey(admin.getId());
-		
-		if (null == a){
+
+		if (null == a) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
 			return res;
 		}
 		Admin ad = new Admin();
 		BeanUtils.copyProperties(admin, ad);
 		List<String> roles = new ArrayList<String>();
-		for (String role : roleIds){
-			roles.add(role);
+		if (roleIds != null && roleIds.length > 0) {
+			for (String role : roleIds) {
+				roles.add(role);
+			}
 		}
 		res.setData(adminService.updateByPrimaryKeySelective(ad, roles));
 		return res;
@@ -418,6 +415,7 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 重置管理员密码
+	 * 
 	 * @param id
 	 * @return
 	 */
@@ -431,10 +429,9 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
 			return res;
 		}
-		
-		
+
 		Admin admin = adminService.selectByPrimaryKey(id);
-		if (null == admin){
+		if (null == admin) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
 			return res;
 		}
@@ -446,7 +443,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(adminService.updateByPrimaryKey(a));
 		return res;
 	}
-	
+
 	/**
 	 * 新增用户
 	 * 
@@ -493,7 +490,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
 	/**
 	 * 个人用户列表
 	 * 
@@ -780,7 +776,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 企业花名册上传
 	 * 
@@ -967,7 +963,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgStandard);
 		return res;
 	}
-	
+
 	/**
 	 * 删除标准制定情况记录
 	 * 
@@ -988,8 +984,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
-	
+
 	/**
 	 * 知识产权列表
 	 * 
@@ -1022,7 +1017,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, uid));
 		return res;
 	}
-	
+
 	/**
 	 * 知识产权信息新增及修改
 	 * 
@@ -1071,7 +1066,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 知识产权证书上传
 	 * 
@@ -1136,7 +1131,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
 	/**
 	 * 删除知识产权记录
 	 * 
@@ -1157,8 +1151,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
-
 	/**
 	 * 上年度高新技术产品(服务)情况列表
 	 * 
@@ -1191,7 +1183,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgTechProductService.listTechProduct(pNo, pSize, uid));
 		return res;
 	}
-	
+
 	/**
 	 * 上年度高新技术产品(服务)情况(新增+修改)
 	 * 
@@ -1237,7 +1229,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgTechProduct);
 		return res;
 	}
-	
+
 	/**
 	 * 高新技术产品台帐上传
 	 * 
@@ -1301,7 +1293,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 删除上年度高新技术产品(服务)情况记录
 	 * 
@@ -1416,7 +1408,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgActivity);
 		return res;
 	}
-	
+
 	/**
 	 * 研发活动立项证明材料上传
 	 * 
@@ -1480,7 +1472,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 删除企业研究开发活动情况
 	 * 
@@ -1592,7 +1584,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 研发活动费用台帐上传
 	 * 
@@ -1656,7 +1648,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 删除企业年度研究开发费用结构明细记录
 	 * 
@@ -1676,7 +1668,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 获取当前用户已录入项目标号列表
 	 * 
@@ -1779,7 +1771,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 企业纳税申报表上传
 	 * 
@@ -1849,7 +1841,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 刪除企业纳税申报信息
 	 * 
@@ -1952,7 +1944,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 企业财务报表上传
 	 * 
@@ -2022,7 +2014,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 删除财务报表
 	 * 
@@ -2043,7 +2035,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
 	/**
 	 * 科技成果转化情况列表
 	 * 
@@ -2118,7 +2109,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 科技成果附件上传
 	 * 
@@ -2182,7 +2173,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 删除科技成果转化情况
 	 * 
@@ -2282,7 +2273,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 荣誉及其他证明材料上传
 	 * 
@@ -2346,7 +2337,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 删除企业荣誉及其他证明材料
 	 * 
@@ -2436,7 +2427,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 研发部门制度上传
 	 * 
@@ -2501,7 +2492,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-
 	/**
 	 * 产学研情况列表
 	 * 
@@ -2564,14 +2554,16 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
 			try {
-				orgTechCenterDetail.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
+				orgTechCenterDetail
+						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
-		
-		if (!StringUtils.isBlank(termEndTimeFormattedDate)){
+
+		if (!StringUtils.isBlank(termEndTimeFormattedDate)) {
 			try {
-				orgTechCenterDetail.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
+				orgTechCenterDetail
+						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -2588,7 +2580,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 产学研技术中心协议上传
 	 * 
@@ -2658,7 +2650,7 @@ public class AdminApiController extends CertifyApiController {
 
 		return res;
 	}
-	
+
 	/**
 	 * 删除技术中心明细
 	 * 
@@ -2679,7 +2671,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-
 	/**
 	 * 获取公司联系人
 	 * 
@@ -2698,7 +2689,22 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(organizationIdentityService.selectContactsByUserId(uid));
 		return res;
 	}
-	
+
+	/**
+	 * 获取公司
+	 */
+	@RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
+	public Result getUnitNames() {
+		Result res = new Result();
+		List<OrganizationIdentity> list = organizationIdentityService.selectAllOrgIndentity();
+		Map<String, String> map = new TreeMap<String, String>();
+		for (OrganizationIdentity o : list) {
+			map.put(o.getUid(), o.getUnitName());
+		}
+		res.setData(map);
+		return res;
+	}
+
 	/**
 	 * 高企认定列表
 	 * 
@@ -2772,7 +2778,7 @@ public class AdminApiController extends CertifyApiController {
 
 		return res;
 	}
-	
+
 	/**
 	 * 高企认定详情入口
 	 * 
@@ -2808,24 +2814,20 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
-	
 	/**
 	 * 高企认定流转状态下拉
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/cognizanceStatus", method = RequestMethod.GET)
-	public Result cognizanceStatus(){
+	public Result cognizanceStatus() {
 		Result res = new Result();
 		if (!checkAdminLogin(res)) {
 			return res;
-		}  
+		}
 		res.setData(disposeCognizanceStatus());
 		return res;
 	}
-	
-
-	
 
 	/**
 	 * 高企认定流转状态
@@ -2848,8 +2850,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
-
 	/**
 	 * 保存高企认定详情
 	 * 
@@ -2893,7 +2893,7 @@ public class AdminApiController extends CertifyApiController {
 
 		return res;
 	}
-	
+
 	/**
 	 * 刪除高企认定
 	 * 
@@ -2990,7 +2990,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 企业年报详情
 	 * 
@@ -3017,7 +3017,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(handleAnnualReport(uid, year));
 		return res;
 	}
-	
+
 	/**
 	 * 高企年报新增+修改
 	 * 
@@ -3068,8 +3068,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
-	
 	/**
 	 * 删除企业年报记录
 	 * 
@@ -3091,8 +3089,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
-
 	/**
 	 * 高企培育列表
 	 * 
@@ -3114,7 +3110,6 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgCognizanceService.listCultivation(uid, province, unitName, pNo, pSize));
 		return res;
 	}
-	
 
 	/**
 	 * 高企相关材料上传
@@ -3174,55 +3169,57 @@ public class AdminApiController extends CertifyApiController {
 	private AnnualReportBo handleAnnualReport(String uid, Integer year) {
 		return orgAnnualReportService.selectAnnualReportBo(uid, year);
 	}
-	
+
 	private Map<String, String> disposeCognizanceStatus() {
-		Map<String, String> status = new  TreeMap<String, String>();
+		Map<String, String> status = new TreeMap<String, String>();
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
-			for (OrgCognizanceStatus p :  OrgCognizanceStatus.values()){
+			for (OrgCognizanceStatus p : OrgCognizanceStatus.values()) {
 				status.put(p.getCode().toString(), p.getDesc());
 				status.remove(OrgCognizanceStatus.OTHER.getCode().toString());
 			}
 		} else {
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CREATE.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CREATE.getCode())) {
 				status.put(OrgCognizanceStatus.CREATE.getCode().toString(), OrgCognizanceStatus.CREATE.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SIGN.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SIGN.getCode())) {
 				status.put(OrgCognizanceStatus.SIGN.getCode().toString(), OrgCognizanceStatus.SIGN.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.DELIVERD.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.DELIVERD.getCode())) {
 				status.put(OrgCognizanceStatus.DELIVERD.getCode().toString(), OrgCognizanceStatus.DELIVERD.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CIRCULATION.getCode())){
-				status.put(OrgCognizanceStatus.CIRCULATION.getCode().toString(), OrgCognizanceStatus.CIRCULATION.getDesc());
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CIRCULATION.getCode())) {
+				status.put(OrgCognizanceStatus.CIRCULATION.getCode().toString(),
+						OrgCognizanceStatus.CIRCULATION.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.PREPARE.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.PREPARE.getCode())) {
 				status.put(OrgCognizanceStatus.PREPARE.getCode().toString(), OrgCognizanceStatus.PREPARE.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SUBMIT.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SUBMIT.getCode())) {
 				status.put(OrgCognizanceStatus.SUBMIT.getCode().toString(), OrgCognizanceStatus.SUBMIT.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.ACCEPT.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.ACCEPT.getCode())) {
 				status.put(OrgCognizanceStatus.ACCEPT.getCode().toString(), OrgCognizanceStatus.ACCEPT.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.APPRVOVED.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.APPRVOVED.getCode())) {
 				status.put(OrgCognizanceStatus.APPRVOVED.getCode().toString(), OrgCognizanceStatus.APPRVOVED.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.REJECT.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.REJECT.getCode())) {
 				status.put(OrgCognizanceStatus.REJECT.getCode().toString(), OrgCognizanceStatus.REJECT.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.ISSUING.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.ISSUING.getCode())) {
 				status.put(OrgCognizanceStatus.ISSUING.getCode().toString(), OrgCognizanceStatus.ISSUING.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.EXPIRED.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.EXPIRED.getCode())) {
 				status.put(OrgCognizanceStatus.EXPIRED.getCode().toString(), OrgCognizanceStatus.EXPIRED.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.FOSTER.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.FOSTER.getCode())) {
 				status.put(OrgCognizanceStatus.FOSTER.getCode().toString(), OrgCognizanceStatus.FOSTER.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SETTLEMENT.getCode())){
-				status.put(OrgCognizanceStatus.SETTLEMENT.getCode().toString(), OrgCognizanceStatus.SETTLEMENT.getDesc());
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SETTLEMENT.getCode())) {
+				status.put(OrgCognizanceStatus.SETTLEMENT.getCode().toString(),
+						OrgCognizanceStatus.SETTLEMENT.getDesc());
 			}
-			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CALLBACK.getCode())){
+			if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CALLBACK.getCode())) {
 				status.put(OrgCognizanceStatus.CALLBACK.getCode().toString(), OrgCognizanceStatus.CALLBACK.getDesc());
 			}
 		}

+ 1 - 1
src/main/java/com/goafanti/common/model/User.java

@@ -22,7 +22,7 @@ public class User extends BaseModel implements AftUser{
     * 用户注册手机号,作为登录依据
     */
     @Size(min = 0, max = 11, message = "{" + ErrorConstants.MOBILE_SIZE_ERROR + "}")
-	@Pattern(regexp = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$", message = "{"
+	@Pattern(regexp = "^[0-9]*[1-9][0-9]*$", message = "{"
 			+ ErrorConstants.MOBILE_PATTERN_ERROR + "}")
     private String mobile;
 

+ 1 - 1
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -327,7 +327,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		PatentLog log = new PatentLog();
 		log.setId(UUID.randomUUID().toString());
 		log.setPid(patentInfo.getId());
-		log.setRecordTime(patentInfo.getCreateTime());
+		log.setRecordTime(patentInfo.getRecordTime());
 		log.setState(PatentInfoStatus.CREATE.getCode());
 		log.setPrincipal(StringUtils.isBlank(aid) && TokenManager.getToken() instanceof Admin ? TokenManager.getAdminId() : "");
 		if (TokenManager.getToken() instanceof Admin) {

+ 26 - 22
src/main/resources/props/error.properties

@@ -1,35 +1,39 @@
-org.apache.shiro.authc.UnknownAccountException=\u8D26\u53F7\u6216\u5BC6\u7801\u4E0D\u5339\u914D\u3002
-org.apache.shiro.authc.IncorrectCredentialsException=\u8D26\u53F7\u6216\u5BC6\u7801\u4E0D\u5339\u914D\u3002
-org.apache.shiro.authc.LockedAccountException=\u8BE5\u8D26\u53F7\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002
-org.apache.shiro.authc.DisabledAccountException=\u8BE5\u8D26\u53F7\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002
-org.apache.shiro.authc.ExcessiveAttemptsException=\u5C1D\u8BD5\u6B21\u6570\u8FC7\u591A\uFF0C\u8D26\u53F7\u6682\u65F6\u88AB\u9501\u5B9A\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002
-org.apache.shiro.session.ExpiredSessionException=\u767B\u5F55\u4FE1\u606F\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u3002
-org.springframework.dao.DataIntegrityViolationException=\u670D\u52A1\u5668\u6253\u4E86\u4E2A\u76F9\u513F\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u7A0D\u540E\u518D\u8BD5\u3002
-org.springframework.jdbc.BadSqlGrammarException=\u6570\u636E\u5F02\u5E38\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u7A0D\u540E\u518D\u8BD5\u3002
-java.text.ParseException=\u53C2\u6570\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u6838\u5BF9\u8F93\u5165\u6570\u636E\u540E\u518D\u8BD5\u3002
+org.apache.shiro.authc.UnknownAccountException=\u8d26\u53f7\u6216\u5bc6\u7801\u4e0d\u5339\u914d\u3002
+org.apache.shiro.authc.IncorrectCredentialsException=\u8d26\u53f7\u6216\u5bc6\u7801\u4e0d\u5339\u914d\u3002
+org.apache.shiro.authc.LockedAccountException=\u8be5\u8d26\u53f7\u5df2\u51bb\u7ed3\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u3002
+org.apache.shiro.authc.DisabledAccountException=\u8be5\u8d26\u53f7\u5df2\u51bb\u7ed3\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u3002
+org.apache.shiro.authc.ExcessiveAttemptsException=\u5c1d\u8bd5\u6b21\u6570\u8fc7\u591a\uff0c\u8d26\u53f7\u6682\u65f6\u88ab\u9501\u5b9a\uff0c\u8bf7\u7a0d\u540e\u518d\u8bd5\u3002
+org.apache.shiro.session.ExpiredSessionException=\u767b\u5f55\u4fe1\u606f\u5df2\u8fc7\u671f\uff0c\u8bf7\u91cd\u65b0\u767b\u5f55\u3002
+org.springframework.dao.DataIntegrityViolationException=\u670d\u52a1\u5668\u6253\u4e86\u4e2a\u76f9\u513f\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u6216\u7a0d\u540e\u518d\u8bd5\u3002
+org.springframework.jdbc.BadSqlGrammarException=\u6570\u636e\u5f02\u5e38\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u6216\u7a0d\u540e\u518d\u8bd5\u3002
+java.text.ParseException=\u53c2\u6570\u683c\u5f0f\u9519\u8bef\uff0c\u8bf7\u6838\u5bf9\u8f93\u5165\u6570\u636e\u540e\u518d\u8bd5\u3002
 
-NON_LOGIN=\u7528\u6237\u672A\u767B\u5F55\u3002
+NON_LOGIN=\u7528\u6237\u672a\u767b\u5f55\u3002
 
-VCODE_ERROR=\u9A8C\u8BC1\u7801\u8F93\u5165\u9519\u8BEF\uFF01
+VCODE_ERROR=\u9a8c\u8bc1\u7801\u8f93\u5165\u9519\u8bef\uff01
 
-PARAM_ERROR={0}\u53C2\u6570\u9519\u8BEF
+PARAM_ERROR={0}\u53c2\u6570\u9519\u8bef
 
-PARAM_INTEGER_ERROR={0}\u53C2\u6570\u5FC5\u987B\u4E3A\u6570\u5B57\u3002
+PARAM_INTEGER_ERROR={0}\u53c2\u6570\u5fc5\u987b\u4e3a\u6570\u5b57\u3002
 
-PARAM_EMPTY_ERROR={0}\u5FC5\u987B\u6307\u5B9A\u3002
+PARAM_EMPTY_ERROR={0}\u5fc5\u987b\u6307\u5b9a\u3002
 
-PARAM_SIZE_ERROR={0}\u53C2\u6570\u957F\u5EA6\u4E0D\u6B63\u786E\uFF0C\u5FC5\u987B\u5728{min}\u548C{max}\u4E4B\u95F4\u3002
+PARAM_SIZE_ERROR={0}\u53c2\u6570\u957f\u5ea6\u4e0d\u6b63\u786e\uff0c\u5fc5\u987b\u5728{min}\u548c{max}\u4e4b\u95f4\u3002
 
-PARAM_PATTERN_ERROR={0}\u53C2\u6570\u683C\u5F0F\u987B\u6B63\u786E\u6307\u5B9A{1}\u3002
+PARAM_PATTERN_ERROR={0}\u53c2\u6570\u683c\u5f0f\u987b\u6b63\u786e\u6307\u5b9a{1}\u3002
 
-EMAIL_SIZE_ERROR=\u90AE\u7BB1\u5730\u5740\u957F\u5EA6\u9519\u8BEF\uFF01
+EMAIL_SIZE_ERROR=\u90ae\u7bb1\u5730\u5740\u957f\u5ea6\u9519\u8bef\uff01
 
-EMAIL_PATTERN_ERROR=\u90AE\u7BB1\u5730\u5740\u683C\u5F0F\u9519\u8BEF\uFF01
+EMAIL_PATTERN_ERROR=\u90ae\u7bb1\u5730\u5740\u683c\u5f0f\u9519\u8bef\uff01
 
-DUNPLICATE_KAY_ERROR={0}\u5DF2\u88AB\u4ED6\u4EBA\u6CE8\u518C\uFF01
+MOBILE_SIZE_ERROR=\u624b\u673a\u53f7\u957f\u5ea6\u9519\u8bef\uff01
 
-DATA_EMPTY_ERROR=\u5F53\u524D{0}\u6CA1\u6709\u6570\u636E\u3002
+MOBILE_PATTERN_ERROR=\u624b\u673a\u53f7\u683c\u5f0f\u9519\u8bef\uff01
 
-PWD_NOT_MATCH_ERROR=\u539F\u5BC6\u7801\u8F93\u5165\u4E0D\u5339\u914D\u3002
+DUNPLICATE_KAY_ERROR={0}\u5df2\u88ab\u4ed6\u4eba\u6ce8\u518c\uff01
 
-NON_CERTIFIED=\u672A\u901A\u8FC7\u5B9E\u540D\u8BA4\u8BC1\uFF0C\u65E0\u6CD5\u64CD\u4F5C\uFF01
+DATA_EMPTY_ERROR=\u5f53\u524d{0}\u6ca1\u6709\u6570\u636e\u3002
+
+PWD_NOT_MATCH_ERROR=\u539f\u5bc6\u7801\u8f93\u5165\u4e0d\u5339\u914d\u3002
+
+NON_CERTIFIED=\u672a\u901a\u8fc7\u5b9e\u540d\u8ba4\u8bc1\uff0c\u65e0\u6cd5\u64cd\u4f5c\uff01