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 | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 474bb45..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
@@ -42,14 +42,15 @@
@GetMapping("/getlist")
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @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");
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword);
- int num=IUserService.selectNum("2");
+ int num=IUserService.selectNum("2",keyword);
return getDataTable(list,num);
}
@@ -92,16 +93,18 @@
return error("部门不能为空");
}
- ResultData data = IUserService.loginByPhonenumber(config.getPhonenumber());
- if (data != null)
+ config.setUserType("2");
+
+ SysUser user=IUserService.selectData(null,config.getPhonenumber());
+ if (user != null)
{
- SysUser user= (SysUser) data.getData();
+ user.setRoleIds(2+"");
user.setUserType("2");
+ user.setUpdateTime(LocalDateTime.now());
//提示用户名或密码错误
return toAjax(IUserService.updateConfig(user));
}
- config.setUserType("2");
-
+ config.setRoleIds(2+"");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId());
@@ -197,7 +200,8 @@
@GetMapping("/selectListByDepartmentId")
@Authorization
public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
- @RequestParam(value = "classifyId",required = false) String classifyId){
+ @RequestParam(value = "classifyId",required = false) String classifyId)
+ {
return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
}
--
Gitblit v1.7.1