From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 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 c533fca..8d421dd 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
@@ -4,6 +4,7 @@
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.service.ISysUserService;
import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
@@ -29,6 +30,9 @@
ISysUserService IUserService;
+ @Autowired
+ IGuideRepairOrderService iGuideRepairOrderService;
+
/**
* 查询列表
*
@@ -38,14 +42,15 @@
@GetMapping("/getlist")
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "keyword",required = false) String keyword)
{
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");
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword);
- int num=IUserService.selectNum("2");
+ int num=IUserService.selectNum("2",keyword);
return getDataTable(list,num);
}
@@ -83,14 +88,30 @@
return error("昵称不能为空");
}
- SysUser user = IUserService.getUserByAccount(config.getLoginName());
- if (user != null) {
- //提示用户名或密码错误
- return error("该账户已存在！");
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("部门不能为空");
}
config.setUserType("2");
+ SysUser user=IUserService.selectData(null,config.getPhonenumber());
+ 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());
+ user.setRoleIds(2+"");
+ user.setUserType("2");
+ user.setStatus(config.getStatus());
+ user.setUpdateTime(LocalDateTime.now());
+ //提示用户名或密码错误
+ return toAjax(IUserService.updateConfig(user));
+ }
+ config.setRoleIds(2+"");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId());
@@ -143,6 +164,13 @@
{
return error("userId不能为空");
}
+
+ int a=iGuideRepairOrderService.countUser(userId,"2");
+ if(a>0)
+ {
+ return error("该人员有工单未处理完不能删除");
+ }
+
return toAjax(IUserService.deleteConfigById(userId));
}
@@ -179,7 +207,8 @@
@GetMapping("/selectListByDepartmentId")
@Authorization
public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
- @RequestParam(value = "classifyId",required = false) String classifyId){
+ @RequestParam(value = "classifyId",required = false) String classifyId)
+ {
return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
}
@@ -190,8 +219,7 @@
@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