Antiloveg 8 years ago
parent
commit
857f396bc9

+ 7 - 1
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -218,7 +218,7 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (null == id) {
+		if (StringUtils.isBlank(id)) {
 			OrgCognizanceProportion cp = new OrgCognizanceProportion();
 			cp.setId(UUID.randomUUID().toString());
 			cp.setUid(uid);
@@ -2754,12 +2754,18 @@ public class AdminApiController extends CertifyApiController {
 	public Result disposeCenterDetail(@Valid InputOrgTechCenterDetail orgTechCenterDetail, BindingResult bindingResult,
 			String projectTimeFormattedDate, String termStartTimeFormattedDate, String termEndTimeFormattedDate) {
 		Result res = new Result();
+		
 
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					OrgTechCenterDetailFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(orgTechCenterDetail.getCid())){
+			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "研发部门相关信息未保存,无法保存!"));
+			return res;
+		}
 
 		if (!StringUtils.isBlank(projectTimeFormattedDate)) {
 			try {

+ 6 - 1
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -48,7 +48,7 @@ public class AdminCopyrightApiController extends CertifyApiController {
 	private AdminService			adminService;
 
 	@RequestMapping(value = "/circulation", method = RequestMethod.POST)
-	public Result circulation(@RequestParam(name = "ids[]", required = true) String[] ids, @Valid InputCopyright ic,
+	public Result circulation(@RequestParam(name = "ids[]", required = false) String[] ids, @Valid InputCopyright ic,
 			BindingResult bindingResult, String recordTimeFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -56,6 +56,11 @@ public class AdminCopyrightApiController extends CertifyApiController {
 					CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+			return res;
+		}
 
 		if (null == ic.getStatus()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转状态", "流转状态"));

+ 6 - 2
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -104,7 +104,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/circulation", method = RequestMethod.POST)
-	public Result circulation(@RequestParam(name = "ids[]", required = true) String[] ids, @Valid InputPatentInfo pi,
+	public Result circulation(@RequestParam(name = "ids[]", required = false) String[] ids, @Valid InputPatentInfo pi,
 			BindingResult bindingResult, String recordTimeFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -112,6 +112,11 @@ public class AdminPatentApiController extends CertifyApiController {
 					PatentInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+			return res;
+		}
 
 		if (null == pi.getState()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转状态", "流转状态"));
@@ -275,7 +280,6 @@ public class AdminPatentApiController extends CertifyApiController {
 		BeanUtils.copyProperties(patentInfo, pi);
 		BeanUtils.copyProperties(patentInfo, pl);
 		patentInfoService.updatePatentInfo(pi, pl, recordTime);
-		res.setData(1);
 		return res;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -237,7 +237,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 			for (CopyrightInfo copyrightInfo : list) {
 				CopyrightLog copyrightLog = new CopyrightLog();
 				BeanUtils.copyProperties(cl, copyrightLog);
-				copyrightLog.getId();
+				copyrightLog.setId(UUID.randomUUID().toString());
 				copyrightLog.setCid(copyrightInfo.getId());
 				copyrightLog.setOperator(TokenManager.getAdminId());
 				log.add(copyrightLog);

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

@@ -382,7 +382,6 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			p.setPrincipal(log.getPrincipal());
 			patentLogMapper.insert(log);
 
-			patentInfoMapper.updateByPrimaryKeySelective(p);
 			if (PatentInfoStatus.getStatus(p.getPatentState()) == PatentInfoStatus.AUTHORIZE) {
 				OrgIntellectualProperty o = new OrgIntellectualProperty();
 				o.setId(UUID.randomUUID().toString());
@@ -423,11 +422,9 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 					orgIntellectualPropertyMapper.updateByPrimaryKeySelective(o);
 				}
 			}
-
 			createNotice(p, log);
-
 		}
-
+		patentInfoMapper.updateByPrimaryKeySelective(p);
 	}
 
 	@Override