From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 11 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 9041603..857e426 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
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ISysUserService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -33,6 +36,9 @@
@Autowired
IGuideRepairOrderService iGuideRepairOrderService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
/**
* 查询列表
*
@@ -43,14 +49,16 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "name",required = false) String name)
+ @RequestParam(value = "keyword",required = false) String keyword,
+ @CurrentUser SysUser sysUser)
{
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,"2",name);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
- int num=IUserService.selectNum("2",name);
+ int num=IUserService.selectNum("2",keyword,ids,null);
return getDataTable(list,num);
}
@@ -95,16 +103,50 @@
config.setUserType("2");
- SysUser user=IUserService.selectData(null,config.getPhonenumber());
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
if (user != null)
{
+ user.setPassword(config.getPassword());
+ user.setDepartmentId(config.getDepartmentId());
+ user.setUserName(config.getUserName());
+ user.setPhonenumber(config.getPhonenumber());
+ user.setLoginName(config.getLoginName());
+ user.setMasterIds(config.getMasterIds());
+ //是否是部门领导（1是 2不是）
+ if(StringUtils.equals("1",config.getIsDivisionHead()))
+ {
+ user.setRoleIds("13");
+ }
+ else
+ {
+ user.setRoleIds("2");
+ }
+ user.setUserType("2");
+ user.setIsDivisionHead(config.getIsDivisionHead());
+ user.setStatus(config.getStatus());
+ user.setUpdateTime(LocalDateTime.now());
+ user.setDepartmentIds(config.getDepartmentIds());
+ user.setDepartmentIdStr(config.getDepartmentIdStr());
+ user.setMoreDepartmentIds(config.getMoreDepartmentIds());
+ user.setMattersIds(config.getMattersIds());
+ user.setMasterNames(config.getMasterNames());
+ user.setMattersNames(config.getMattersNames());
//提示用户名或密码错误
- return ResultData.error("该手机号已注册账户！请更换");
+ return toAjax(IUserService.updateConfig(user));
}
-
+ //是否是部门领导（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.setUserId(Snowflake.getId()+"");
+ config.setIsDivisionHead(config.getIsDivisionHead());
return toAjax(IUserService.insertConfig(config));
}
@@ -137,6 +179,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));
}
@@ -160,8 +218,11 @@
{
return error("该人员有工单未处理完不能删除");
}
-
- return toAjax(IUserService.deleteConfigById(userId));
+ SysUser user=IUserService.selectData(userId,null,null);
+ user.setUserType("4");
+ user.setRoleIds("4");
+ user.setIsDivisionHead("2");
+ return toAjax(IUserService.updateConfig(user));
}
/**
@@ -209,8 +270,8 @@
@ApiOperation(" 查询导办用户列表（不分页）")
@GetMapping("/queryList")
@Authorization
- public ResultData queryList(){
- return ResultData.success(IUserService.queryList(2));
+ public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
+ return ResultData.success(IUserService.queryList(2,keyWord));
}
}
--
Gitblit v1.7.1