anderx 1 год назад
Родитель
Сommit
14433f3464

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

@@ -1156,7 +1156,7 @@
     <select id="selectByMainIdAndReviewer" resultMap="PublicReleaseMap">
         select
         a.id, a.aid, a.release_start, a.release_end, a.remarks, a.annex_url, a.status, a.create_time, a.pid, a.pname, a.duration, a.valid_date, a.supplement, a.audit_info, a.plan, a.expected_effect, a.next_plan, a.type, a.order_no, a.update_time, a.update_status, a.assist, a.assist_aid, a.assist_aid_name, a.main_id, a.main_name
-        from public_release a left join admin_public_reviewer b on a.aid =b.aid
+        from public_release a left join admin_public_reviewer b on a.aid =b.aid and b.type=1
         where a.main_id = #{id}
         and b.reviewer_id = #{reviewerId}
     </select>

+ 1 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -992,7 +992,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		PublicRelease newPublic=new PublicRelease();
 		if (status==0){
 			content+="已被驳回。";
-			addpublicLog(use.getId(), status, remarks);
 			newPublic.setId(use.getId());
 			newPublic.setStatus(status);
 			addpublicLog(id, status, remarks);
@@ -1005,6 +1004,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 		}else if(status==2){
 			content+="已通过审核。";
+			addpublicLog(id, status, remarks);
 			for (PublicRelease e : publicReleases) {
 				PublicRelease newPublic2=new PublicRelease();
 				newPublic2.setId(e.getId());