Explorar el Código

公出详情查看权限设置

anderx hace 2 años
padre
commit
7c9a9e79e0

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

@@ -477,10 +477,13 @@
     date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
     a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
     a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames
+    pe.aname,pe.status peStatus
     from public_release a  left join admin c on a.aid =c.id
+     <if test="type==0 or type==4">
+       left join (select * from public_examine where aid= #{aid} )pe on a.id=pe.prid
+     </if>
     <if test="type==4">
-      left join public_release_details b on a.id=b.prid
-      left join user e on b.uid=e.id
+      left join public_release_details b on a.id=b.prid left join user e on b.uid=e.id
     </if>
     <if test="type==2">
       left join department d on c.department_id =d.id

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

@@ -547,7 +547,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 			return res;
 		}
-
 		publicReleaseMapper.updateByPrimaryKeySelective(p);
 			return 1;
 	}