From 8f777d784ee51a7e6ad99e16072c86fea0d39ae3 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 15 十一月 2022 18:04:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 c8556f4..75ea071 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
@@ -56,7 +56,7 @@
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
int num=IUserService.selectNum("2",keyword,ids);
return getDataTable(list,num);
@@ -112,19 +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.setIsDivisionHead(config.getIsDivisionHead());
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");
+ config.setIsDivisionHead(config.getIsDivisionHead());
return toAjax(IUserService.insertConfig(config));
}
@@ -157,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));
}
--
Gitblit v1.7.1