Merge branch 'dsc' into 'develop'

员工社保优化

See merge request 8timerv2/8timerapiv200!204

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

@@ -1551,8 +1551,8 @@ public class YgglController {
 	@GetMapping(value = "/ygsbgjj")
 	@GetMapping(value = "/ygsbgjj")
 	@ApiOperation(value = "65.获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "65.获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 65)
 	@ApiOperationSupport(order = 65)
-	public Result<List<YgglAttaSbgjj>> selectygsbgjj(@CurrentUser UserBean userBean) {
-		List<YgglAttaSbgjj> ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectList(
+	public Result<YgglAttaSbgjj> selectygsbgjj(@CurrentUser UserBean userBean) {
+		YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectOne(
 				new QueryWrapper<YgglAttaSbgjj>().lambda().eq(YgglAttaSbgjj::getOrgCode, userBean.getOrgCode())
 				new QueryWrapper<YgglAttaSbgjj>().lambda().eq(YgglAttaSbgjj::getOrgCode, userBean.getOrgCode())
 						.eq(YgglAttaSbgjj::getEmpNum, userBean.getEmpNum()));
 						.eq(YgglAttaSbgjj::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaSbgjj);
 		return ResultUtil.data(ygglAttaSbgjj);