Merge branch 'dsc' into 'develop'

部门判空

See merge request 8timerv2/8timerapiv200!254

src/main/java/cn/timer/api/controller/LoginController.java

@@ -681,6 +681,7 @@ public class LoginController {
 					Integer upId = gw.getUpId();
 					Integer upId = gw.getUpId();
 					ZzglBmgwM bm = ZzglBmgwM.builder().build()
 					ZzglBmgwM bm = ZzglBmgwM.builder().build()
 							.selectOne(new LambdaQueryWrapper<ZzglBmgwM>().eq(ZzglBmgwM::getId, upId));
 							.selectOne(new LambdaQueryWrapper<ZzglBmgwM>().eq(ZzglBmgwM::getId, upId));
+					if (bm != null && bm.getName() != null)
 						qysDto.setBmName(bm.getName());
 						qysDto.setBmName(bm.getName());
 				}
 				}
 			}
 			}