Explorar o código

新增公出营销员和技术他人公出列表审核中显示BUG修复

anderx hai 1 ano
pai
achega
7ccb622e40

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

@@ -423,6 +423,7 @@
             <if test="assistType ==1">
                 and a.assist in(0,1,2)
             </if>
+
             <if test="aid !=null">
                 and a.aid= #{aid}
             </if>
@@ -826,7 +827,8 @@
     <select id="selectCountByAssistUnaudited" resultType="java.lang.Integer">
         SELECT count(*)
         from public_release a left join admin_public_reviewer b on a.aid =b.aid
-        where a.`type`=3 and a.assist =2 and a.status =1  and b.reviewer_id = #{aid}
+        where a.`type`=3 and a.assist =2 and a.status =1 and b.type =1
+          and b.reviewer_id = #{aid}
     </select>
     <select id="selectCountByUnaudited" resultType="java.lang.Integer">
         select  COUNT(*)
@@ -834,6 +836,7 @@
         where a.public_type in (0,2)
           and a.assist in(0,1)
           and a.tech_start_process in (0,2)
+          and a.status =1
           and c.reviewer = #{aid}
     </select>
     <select id="selectCountByOtherUnaudited" resultType="java.lang.Integer">

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

@@ -707,11 +707,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			list.forEach(e ->{ ids.add(e.getId()); });
 			List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
 			for (OutPublicReleaseList e : list) {
-				if (e.getStatus()==1
-						&&((e.getPublicType()==0||e.getPublicType()==2)
-								&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
-				){
-					e.setAdminExamine(e.getUserAdminName()+" 未审核");
+				if (e.getStatus()==1){
+					if (((e.getPublicType()==0||e.getPublicType()==2)
+							&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
+						e.setAdminExamine(e.getReviewerName()+" 未审核");
+					}else {
+						e.setAdminExamine(e.getUserAdminName()+" 未审核");
+					}
 				}else if (e.getStatus()==0) {
 					e.setAdminExamine("");
 				}else {