Browse Source

feat(日志):用户操作日志

liutao 5 months ago
parent
commit
58c7b16372

+ 6 - 2
src/main/resources/mapper/project/ProjectCoreEnterpriseMapper.xml

@@ -49,10 +49,14 @@
 				AND t1.status = #{status}
 			</if>
 			<if test="userIds != null and userIds.size()>0">
-				AND t7.risk_manager in
-				<foreach collection="userIds" index="index" item="item"  open="(" separator="," close=")">
+				AND (t7.risk_manager in
+				<foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
 					#{item}
 				</foreach>
+				    or t7.project_manager in
+				<foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
+					#{item}
+				</foreach>)
 			</if>
 		</where>
 			order by t1.gmt_modified

+ 6 - 2
src/main/resources/mapper/project/ProjectInformationMapper.xml

@@ -81,10 +81,14 @@
                 AND t1.status = #{status}
             </if>
             <if test="userIds != null and userIds.size()>0">
-                AND t6.risk_manager in
-                <foreach collection="userIds" index="index" item="item"  open="(" separator="," close=")">
+                AND (t6.risk_manager in
+                <foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
+                    or t6.project_manager in
+                <foreach collection="userIds" index="index" item="item"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>)
             </if>
             order by t1.gmt_modified
     </select>

+ 6 - 2
src/main/resources/mapper/supplier/SupplierInfoMapper.xml

@@ -46,10 +46,14 @@
                 AND t1.status = #{status}
             </if>
             <if test="userIds != null and userIds.size()>0">
-                AND  t4.risk_manager in
-                <foreach collection="userIds" index="index" item="item"  open="(" separator="," close=")">
+                AND (t4.risk_manager in
+                <foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
+                or t4.project_manager in
+                <foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach> )
             </if>
     </select>