Merge branch 'dsc' into 'develop'

部门判空

See merge request 8timerv2/8timerapiv200!254

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

@@ -681,11 +681,12 @@ public class LoginController {
 					Integer upId = gw.getUpId();
 					ZzglBmgwM bm = ZzglBmgwM.builder().build()
 							.selectOne(new LambdaQueryWrapper<ZzglBmgwM>().eq(ZzglBmgwM::getId, upId));
-					qysDto.setBmName(bm.getName());
+					if (bm != null && bm.getName() != null)
+						qysDto.setBmName(bm.getName());
 				}
 			}
 		}
-		
+
 		if (qys.size() == 0)
 			return ResultUtil.error("没有任何公司可以查看！");
 		qyzxEmpLogin1.setQys(qys);