From 17f1c3a86565cb9fbda2e28896066acb7b8f29b6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 08 十一月 2022 17:50:24 +0800
Subject: [PATCH] 工单可以批量导入
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index ff8f6f1..992403e 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -56,7 +56,14 @@
if(user==null)
{
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
{
//提示用户名或密码错误
@@ -111,6 +118,12 @@
}
else
{
+ if(StringUtils.equals("4",user.getUserType()))
+ {
+ //提示用户名或密码错误
+ return ResultData.fail(HttpStatus.UNAUTHORIZED, "账户不存在");
+ }
+
if(!password.equals(user.getPassword()))
{
//提示用户名或密码错误
@@ -182,9 +195,9 @@
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,"3",keyword);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
- int num=IUserService.selectNum("3",keyword);
+ int num=IUserService.selectNum("3",keyword,null);
return getDataTable(list,num);
}
@@ -222,17 +235,44 @@
return error("手机号不能为空");
}
+
+
+
SysUser user = IUserService.selectData("",config.getPhonenumber(),"");
SysUser user2 = IUserService.selectData("","",config.getLoginName());
if (user != null) {
- //提示用户名或密码错误
- return error("该用户已存在！");
+ if(StringUtils.equals("4",user.getUserType()))
+ {
+ config.setUserId(user.getUserId());
+ config.setCreateBy(user.getUserId()+"");
+ config.setUserType("3");
+
+ config.setUpdateTime(LocalDateTime.now());
+ return toAjax(IUserService.updateConfig(config));
+ }
+ else
+ {
+ //提示用户名或密码错误
+ return error("该用户已存在！");
+ }
}
if(user2 != null)
{
- //提示用户名或密码错误
- return error("该登录账户已存在！请修改登录账户");
+ if(StringUtils.equals("4",user2.getUserType()))
+ {
+ config.setUserId(user2.getUserId());
+ config.setCreateBy(user2.getUserId()+"");
+ config.setUserType("3");
+
+ config.setUpdateTime(LocalDateTime.now());
+ return toAjax(IUserService.updateConfig(config));
+ }
+ else
+ {
+ //提示用户名或密码错误
+ return error("该用户已存在！");
+ }
}
config.setCreateBy(sysUser.getUserId()+"");
--
Gitblit v1.7.1