Antiloveg 8 years ago
parent
commit
d71a97b9d6

+ 6 - 5
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1803,12 +1803,13 @@ public class AdminApiController extends CertifyApiController {
 
 		OrgActivityCost oac = new OrgActivityCost();
 		BeanUtils.copyProperties(orgActivityCost, oac);
-
+		
+		if (null != orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear())) {
+			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+			return res;
+		}
+		
 		if (StringUtils.isBlank(oac.getId())) {
-			if (null != orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear())) {
-				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
-				return res;
-			}
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 			if (null != ac) {
 				Calendar c = Calendar.getInstance();

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

@@ -516,7 +516,7 @@
   <select id="selectLatelyRecord" resultType="com.goafanti.cognizance.bo.LatelyCogRecord" parameterType="java.lang.String" >
     select c.id, c.issuing_date as issuingDate, l.state, MAX(l.record_time) as recordTime
 		   from org_cognizance c LEFT JOIN org_cognizance_log l on 
-		   c.id = l.cid  where c.uid = #{uid,jdbcType=VARCHAR} and c.deleted_sign = 0 group by  c.id
+    c.id = l.cid  where c.uid = #{uid,jdbcType=VARCHAR} and c.deleted_sign = 0 group by  c.id
   </select>
   
   <select id="selectContractCognizanceByContractId" resultType="com.goafanti.cognizance.bo.CognizanceContractBo" parameterType="java.lang.String" >