From 23ea8ee10fac0ee12d6f2be822c8d6af4c13e330 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 14:35:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 3aabeaa..63137fe 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
@@ -5,6 +5,7 @@
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.ISysUserService;
+import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,7 @@
*/
@ApiOperation("用户列表接口")
@GetMapping("/getlist")
+ @Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize)
{
@@ -70,6 +72,11 @@
return error("密码不能为空");
}
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
if(StringUtils.isEmpty(config.getUserName()))
{
return error("昵称不能为空");
@@ -85,7 +92,7 @@
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
-
+ config.setUserId(Snowflake.getId());
return toAjax(IUserService.insertConfig(config));
}
@@ -105,6 +112,12 @@
return error("userId不能为空");
}
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
+
if(StringUtils.isEmpty(config.getLoginName()))
{
return error("账户不能为空");
@@ -116,7 +129,7 @@
}
/**
- * 删除聊天记录
+ * 删除导办用户接口
*
* @return 结果
*/
@@ -133,7 +146,7 @@
}
/**
- * 修改空闲状态
+ * 修改导办用户空闲状态接口
*
* @param config 参数配置信息
* @return 结果
@@ -156,4 +169,17 @@
return toAjax(IUserService.updateConfig(config));
}
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ @ApiOperation("根据部门id及分类id获取导办用户")
+ @GetMapping("/selectListByDepartmentId")
+ @Authorization
+ public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
+ @RequestParam("classifyId") String classifyId){
+ return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
+ }
+
}
--
Gitblit v1.7.1