Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!479

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -793,6 +793,10 @@ public class SpmkController {
 			if(mySummaryQueryDto.getSts() == null) {
 			if(mySummaryQueryDto.getSts() == null) {
 				mySummaryQueryDto.setSts(0);
 				mySummaryQueryDto.setSts(0);
 			}
 			}
+			//我发起的
+			if(mySummaryQueryDto.getType() ==  0) {
+				mySummaryQueryDto.setSts(null);
+			}
 			// 缺-部门id 搜索
 			// 缺-部门id 搜索
 			IPage<SpmkApproveSummary> pageAs = spmkApproveSummaryMapper.selectPageByQueryForEmpNum(page, mySummaryQueryDto);
 			IPage<SpmkApproveSummary> pageAs = spmkApproveSummaryMapper.selectPageByQueryForEmpNum(page, mySummaryQueryDto);