From 5b3f7effde361525994ca9928e599b88a646593b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 14 十一月 2022 17:05:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 1ca5880..c7a8798 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
@@ -114,6 +114,7 @@
user.setMasterIds(config.getMasterIds());
user.setRoleIds("2");
user.setUserType("2");
+ user.setIsDivisionHead("1");
user.setStatus(config.getStatus());
user.setUpdateTime(LocalDateTime.now());
//提示用户名或密码错误
@@ -123,6 +124,7 @@
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId()+"");
+ config.setIsDivisionHead("1");
return toAjax(IUserService.insertConfig(config));
}
@@ -155,6 +157,12 @@
config.setUserType("2");
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
+ if (user != null)
+ {
+ //提示用户名或密码错误
+ return ResultData.error("该手机账户已存在！请更换手机号");
+ }
return toAjax(IUserService.updateConfig(config));
}
@@ -179,7 +187,9 @@
return error("该人员有工单未处理完不能删除");
}
SysUser user=IUserService.selectData(userId,null,null);
- user.setUserType("3");
+ user.setUserType("4");
+ user.setRoleIds("4");
+ user.setIsDivisionHead("2");
return toAjax(IUserService.updateConfig(user));
}
--
Gitblit v1.7.1