From c9cd30d5beab336ff61da1d6f6cdbe28c4dcd4e8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 13 十月 2022 17:18:49 +0800
Subject: [PATCH] 修改回复模板报错 bug
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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 ed2193b..474bb45 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
@@ -4,6 +4,7 @@
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.service.ISysUserService;
import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
@@ -11,6 +12,7 @@
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.query.Param;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,9 @@
@Autowired
ISysUserService IUserService;
+
+ @Autowired
+ IGuideRepairOrderService iGuideRepairOrderService;
/**
* 查询列表
@@ -72,17 +77,29 @@
return error("密码不能为空");
}
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
if(StringUtils.isEmpty(config.getUserName()))
{
return error("昵称不能为空");
}
- SysUser user = IUserService.getUserByAccount(config.getLoginName());
- if (user != null) {
- //提示用户名或密码错误
- return error("该账户已存在！");
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("部门不能为空");
}
+ ResultData data = IUserService.loginByPhonenumber(config.getPhonenumber());
+ if (data != null)
+ {
+ SysUser user= (SysUser) data.getData();
+ user.setUserType("2");
+ //提示用户名或密码错误
+ return toAjax(IUserService.updateConfig(user));
+ }
config.setUserType("2");
config.setCreateTime(LocalDateTime.now());
@@ -107,6 +124,12 @@
return error("userId不能为空");
}
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
+
if(StringUtils.isEmpty(config.getLoginName()))
{
return error("账户不能为空");
@@ -118,7 +141,7 @@
}
/**
- * 删除聊天记录
+ * 删除导办用户接口
*
* @return 结果
*/
@@ -131,11 +154,18 @@
{
return error("userId不能为空");
}
+
+ int a=iGuideRepairOrderService.countUser(userId,"2");
+ if(a>0)
+ {
+ return error("该人员有工单未处理完不能删除");
+ }
+
return toAjax(IUserService.deleteConfigById(userId));
}
/**
- * 修改空闲状态
+ * 修改导办用户空闲状态接口
*
* @param config 参数配置信息
* @return 结果
@@ -167,8 +197,19 @@
@GetMapping("/selectListByDepartmentId")
@Authorization
public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
- @RequestParam("classifyId") String classifyId){
+ @RequestParam(value = "classifyId",required = false) String classifyId){
return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
}
+ /**
+ * 查询导办用户列表（不分页）
+ * @return 结果
+ */
+ @ApiOperation(" 查询导办用户列表（不分页）")
+ @GetMapping("/queryList")
+ @Authorization
+ public ResultData queryList(){
+ return ResultData.success(IUserService.queryList(2));
+ }
+
}
--
Gitblit v1.7.1