From b892b3d8c2a536b6c2f5f9b9e67e195779037665 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 14:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 493289d..81f2f09 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
@@ -112,17 +112,35 @@
user.setPhonenumber(config.getPhonenumber());
user.setLoginName(config.getLoginName());
user.setMasterIds(config.getMasterIds());
- user.setRoleIds("2");
+ //是否是部门领导（1是 2不是）
+ if(StringUtils.equals("1",config.getIsDivisionHead()))
+ {
+ user.setRoleIds("13");
+ }
+ else
+ {
+ user.setRoleIds("2");
+ }
user.setUserType("2");
+ user.setIsDivisionHead("1");
user.setStatus(config.getStatus());
user.setUpdateTime(LocalDateTime.now());
//提示用户名或密码错误
return toAjax(IUserService.updateConfig(user));
}
- config.setRoleIds(2+"");
+ //是否是部门领导（1是 2不是）
+ if(StringUtils.equals("1",config.getIsDivisionHead()))
+ {
+ config.setRoleIds("13");
+ }
+ else
+ {
+ config.setRoleIds("2");
+ }
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId()+"");
+ config.setIsDivisionHead("1");
return toAjax(IUserService.insertConfig(config));
}
@@ -155,6 +173,22 @@
config.setUserType("2");
+ //是否是部门领导（1是 2不是）
+ if(StringUtils.equals("1",config.getIsDivisionHead()))
+ {
+ config.setRoleIds("13");
+ }
+ else
+ {
+ config.setRoleIds("2");
+ }
+
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
+ if (user != null && !(user.getUserId().equals(config.getUserId())))
+ {
+ //提示用户名或密码错误
+ return ResultData.error("该手机账户已存在！请更换手机号");
+ }
return toAjax(IUserService.updateConfig(config));
}
@@ -181,6 +215,7 @@
SysUser user=IUserService.selectData(userId,null,null);
user.setUserType("4");
user.setRoleIds("4");
+ user.setIsDivisionHead("2");
return toAjax(IUserService.updateConfig(user));
}
--
Gitblit v1.7.1