From b4bfd4f177e78726adfa802f4e1ea4da147361b3 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 14:40:21 +0800
Subject: [PATCH] 修改【统计】计算有问题 bug
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 7bed014..47af669 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -43,14 +43,14 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "name",required = false) String name)
+ @RequestParam(value = "keyword",required = false) String keyword)
{
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",name);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword);
- int num=IUserService.selectNum("2",name);
+ int num=IUserService.selectNum("2",keyword);
return getDataTable(list,num);
}
@@ -98,8 +98,11 @@
SysUser user=IUserService.selectData(null,config.getPhonenumber());
if (user != null)
{
+ user.setRoleIds(2+"");
+ user.setUserType("2");
+ user.setUpdateTime(LocalDateTime.now());
//提示用户名或密码错误
- return ResultData.error("该手机号已注册账户！请更换");
+ return toAjax(IUserService.updateConfig(user));
}
config.setRoleIds(2+"");
config.setCreateTime(LocalDateTime.now());
--
Gitblit v1.7.1