Merge branch 'tzq' into 'develop'

Tzq

See merge request 8timerv2/8timerapiv200!97

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

@@ -87,6 +87,7 @@ produces = { "application/json","multipart/form-data" })
 //@BindingResultCtrol(title = "发起审批")
 public class SpmkController {
 
+	
 	@Autowired
     private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper;
 	@Autowired

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -534,6 +534,12 @@ public class YgglController {
 		
 		List<QyzxEmpLogin> listEl = qyzxEmpLoginMapper.selectList(new QueryWrapper<QyzxEmpLogin>().lambda()
 				.select(QyzxEmpLogin::getPhone));
+		listEl = listEl != null ? listEl.stream()
+				
+				
+				.filter(o -> o != null && o.getPhone() != null)
+				.collect(Collectors.toList()) : null;
+		System.out.println(JSONUtil.parseObj(listEl));
 //		listEl.stream().filter(predicate)
 //		listEl.stream().filter(item -> objId.equals(item.getUpId())).forEach(zzglBmgwM -> {
 //			list.add(zzglBmgwM.getId());
@@ -542,7 +548,6 @@ public class YgglController {
 		
 		//抽取 登录表 的phone的集合
 		List<String> listPhone = listEl.stream()
-				.filter(o -> o.getPhone() != null)
 				.map(QyzxEmpLogin::getPhone)
 				.collect(Collectors.toList());