ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(企标稽查流程): 79478

Browse Source
This commit is contained in:
yjz
2024-01-05 14:15:32 +08:00
parent d4d2f923df
commit 85e985bfa3
2 changed files with 243 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+235 -230
View File
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
@@ -76,23 +77,23 @@ import java.util.stream.Collectors;
@RestController
@RequestMapping("/sys/user")
public class SysUserController {
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
private ISysUserService sysUserService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private ISysDepartService sysDepartService;
@Autowired
private ISysUserRoleService sysUserRoleService;
@Autowired
private ISysUserRoleService sysUserRoleService;
@Autowired
private ISysUserDepartService sysUserDepartService;
@Autowired
private ISysUserDepartService sysUserDepartService;
@Autowired
private RedisUtil redisUtil;
@Autowired
private RedisUtil redisUtil;
@Value("${jero.path.upload}")
private String upLoadPath;
@@ -126,7 +127,7 @@ public class SysUserController {
@ApiOperation(value="用户列表查询", notes="用户列表查询")
@PermissionData(pageComponent = "system/UserList")
@GetMapping("/page")
public Result<IPage<SysUser>> queryPageList(SysUser user,
public Result<IPage<SysUser>> queryPageList(SysUser user,
@RequestParam(name="departId", required = false) String departId,
@RequestParam(name="roleId", required = false) String roleId,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -139,9 +140,9 @@ public class SysUserController {
user.setEmail(this.sysUserService.proceedEmailEncrypt(user.getEmail()));
user.setPhone(this.sysUserService.proceedPhoneEncrypt(user.getPhone()));
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, parameterMap);
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, parameterMap);
Page<SysUser> page = new Page<>(pageNo, pageSize);
Page<SysUser> page = new Page<>(pageNo, pageSize);
List<String> subDepIds = null;
if (StrUtil.isNotEmpty(departId)){
subDepIds = sysDepartService.getSubDepIdsByDepId(departId);
@@ -151,9 +152,13 @@ public class SysUserController {
.or().like("username", user.getRealnameOrUsername()));
}
queryWrapper.ne("username", "admin");
IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
//批量查询用户的所属部门
IPage<SysUser> pageList;
try {
pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
}catch (Exception e){
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
}
//批量查询用户的所属部门
//step.1 先拿到全部的 useids
List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
if(userIds!=null && !userIds.isEmpty()){
@@ -168,15 +173,15 @@ public class SysUserController {
});
}
result.setSuccess(true);
result.setResult(pageList);
SysUserController.log.info(pageList.toString());
return result;
}
result.setSuccess(true);
result.setResult(pageList);
SysUserController.log.info(pageList.toString());
return result;
}
@RequiresPermissions("user:add")
@PostMapping("/add")
public Result<Object> add(@RequestBody JSONObject jsonObject) {
public Result<Object> add(@RequestBody JSONObject jsonObject) {
try {
String selectedRoles = jsonObject.getString(SELECTED_ROLES);
String selectedDeparts = jsonObject.getString("selecteddeparts");
@@ -189,11 +194,11 @@ public class SysUserController {
// 保存用户走一个service 保证事务
sysUserService.saveUser(user, selectedRoles, selectedDeparts);
return Result.OK(OPTION_SUCCESS);
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败");
}
}
}
}
/**
* 给用户信息处理数据，赋基础值
@@ -228,27 +233,27 @@ public class SysUserController {
@RequiresPermissions("user:edit")
@PostMapping("/edit")
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
String roles = jsonObject.getString(SELECTED_ROLES);
String departs = jsonObject.getString("selecteddeparts");
String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
try {
SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2);
if(sysUser==null) {
try {
SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2);
if(sysUser==null) {
return Result.error(INEXISTENCE);
}else {
}else {
SysUser user = getSysUser(jsonObject, rsaPrivateKey, sysUser);
// 修改用户走一个service 保证事务
sysUserService.editUser(user, roles, departs);
return Result.OK(OPTION_SUCCESS);
}
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
}
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败");
}
}
}
}
@NotNull
private SysUser getSysUser(@RequestBody JSONObject jsonObject, String rsaPrivateKey, SysUser sysUser) {
@@ -282,10 +287,10 @@ public class SysUserController {
if(StringUtils.isBlank(id)){
return Result.error("参数不识别！");
}
baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
this.sysUserService.deleteUser(id);
return Result.OK("删除用户成功");
}
baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
this.sysUserService.deleteUser(id);
return Result.OK("删除用户成功");
}
@PostMapping("/deleteBatch")
@RequiresPermissions("sys:user:sel")
@@ -294,29 +299,29 @@ public class SysUserController {
if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！");
}
baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
this.sysUserService.deleteBatchUsers(ids);
return Result.OK("批量删除用户成功");
}
baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
this.sysUserService.deleteBatchUsers(ids);
return Result.OK("批量删除用户成功");
}
@RequiresPermissions("user:edit")
@PostMapping("/frozenBatch")
public Result<Object> frozenBatch(@RequestBody JSONObject jsonObject) {
try {
String ids = jsonObject.getString("ids");
String status = jsonObject.getString("status");
String[] arr = ids.split(",");
for (String id : arr) {
if(oConvertUtils.isNotEmpty(id)) {
this.sysUserService.update(new SysUser().setStatus(Integer.parseInt(status)),
new UpdateWrapper<SysUser>().lambda().eq(SysUser::getId,id));
}
}
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
public Result<Object> frozenBatch(@RequestBody JSONObject jsonObject) {
try {
String ids = jsonObject.getString("ids");
String status = jsonObject.getString("status");
String[] arr = ids.split(",");
for (String id : arr) {
if(oConvertUtils.isNotEmpty(id)) {
this.sysUserService.update(new SysUser().setStatus(Integer.parseInt(status)),
new UpdateWrapper<SysUser>().lambda().eq(SysUser::getId,id));
}
}
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败"+e.getMessage());
}
}
return Result.OK(OPTION_SUCCESS);
}
@@ -347,8 +352,8 @@ public class SysUserController {
/**
* 校验用户账号是否唯一<br>
* 可以校验其他 需要检验什么就传什么。。。
* 校验用户账号是否唯一<br>
* 可以校验其他 需要检验什么就传什么。。。
*
* @param sysUser
* @return
@@ -415,7 +420,7 @@ public class SysUserController {
}
return result;
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
SysUserController.log.error(e.getMessage(), e);
result.setSuccess(false);
result.setMessage("查找过程中出现了异常: " + e.getMessage());
return result;
@@ -479,7 +484,7 @@ public class SysUserController {
result.setResult(userList);
return result;
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
SysUserController.log.error(e.getMessage(), e);
result.setSuccess(false);
return result;
}
@@ -548,7 +553,7 @@ public class SysUserController {
//导出文件名称
mv.addObject(JeroController.FILE_NAME, "用户列表");
mv.addObject(JeroController.CLASS, SysUser.class);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ExportParams exportParams = new ExportParams("用户列表数据", "导出人:"+user.getRealname(), "导出信息");
exportParams.setImageBasePath(upLoadPath);
mv.addObject(JeroController.PARAMS, exportParams);
@@ -605,7 +610,7 @@ public class SysUserController {
try {
file.getInputStream().close();
} catch (IOException e) {
SysUserController.log.error(e.getMessage(), e);
SysUserController.log.error(e.getMessage(), e);
}
}
}
@@ -680,34 +685,34 @@ public class SysUserController {
}
/**
* @功能：根据id 批量查询
* @param userIds
* @return
*/
* @功能：根据id 批量查询
* @param userIds
* @return
*/
@GetMapping("/queryByIds")
public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
Result<Collection<SysUser>> result = new Result<>();
String[] userId = userIds.split(",");
Collection<String> idList = Arrays.asList(userId);
Collection<SysUser> userRole = sysUserService.listByIds(idList);
public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
Result<Collection<SysUser>> result = new Result<>();
String[] userId = userIds.split(",");
Collection<String> idList = Arrays.asList(userId);
Collection<SysUser> userRole = sysUserService.listByIds(idList);
userRole.forEach(user -> {
sysUserService.proceedUserInfoDecrypt(user);
});
result.setSuccess(true);
result.setResult(userRole);
return result;
}
result.setSuccess(true);
result.setResult(userRole);
return result;
}
/**
* 首页用户重置密码
*/
/**
* 首页用户重置密码
*/
@PostMapping("/updatePassword")
@RequiresPermissions("user:edit")
public Result<T> updatePassword(@RequestBody JSONObject json) {
String username = json.getString(USER_NAME);
String oldpassword = json.getString("oldpassword");
String password = json.getString("password");
String confirmpassword = json.getString("confirmpassword");
public Result<T> updatePassword(@RequestBody JSONObject json) {
String username = json.getString(USER_NAME);
String oldpassword = json.getString("oldpassword");
String password = json.getString("password");
String confirmpassword = json.getString("confirmpassword");
String RSAPublicKey = json.getString(RSA_PUBLIC_KEY);
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
@@ -725,12 +730,12 @@ public class SysUserController {
SysUserController.log.error(e.getMessage(),e);
}
SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
if(user==null) {
return Result.error(USER_ERROR_MSG);
}
return sysUserService.resetPassword(username,oldpassword,password,confirmpassword);
}
SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
if(user==null) {
return Result.error(USER_ERROR_MSG);
}
return sysUserService.resetPassword(username,oldpassword,password,confirmpassword);
}
@GetMapping("/userRoleList")
public Result<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -969,7 +974,7 @@ public class SysUserController {
@GetMapping("/getCurrentUserDeparts")
public Result<Map<String,Object>> getCurrentUserDeparts() {
try {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId());
Map<String,Object> map = new HashMap<>();
map.put("list", list);
@@ -982,44 +987,44 @@ public class SysUserController {
}
/**
* 用户注册接口
*
* @param jsonObject
* @param user
* @return
*/
@PostMapping("/register")
public Result<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) {
Result<JSONObject> result = new Result<>();
String phone = jsonObject.getString(PHONE);
String smscode = jsonObject.getString(SMSCODE);
Object code = redisUtil.get(phone);
String username = jsonObject.getString(USER_NAME);
//未设置用户名，则用手机号作为用户名
if(oConvertUtils.isEmpty(username)){
/**
* 用户注册接口
*
* @param jsonObject
* @param user
* @return
*/
@PostMapping("/register")
public Result<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) {
Result<JSONObject> result = new Result<>();
String phone = jsonObject.getString(PHONE);
String smscode = jsonObject.getString(SMSCODE);
Object code = redisUtil.get(phone);
String username = jsonObject.getString(USER_NAME);
//未设置用户名，则用手机号作为用户名
if(oConvertUtils.isEmpty(username)){
username = phone;
}
//未设置密码，则随机生成一个密码
String password = jsonObject.getString("password");
if(oConvertUtils.isEmpty(password)){
String password = jsonObject.getString("password");
if(oConvertUtils.isEmpty(password)){
password = RandomUtil.randomString(8);
}
String email = jsonObject.getString("email");
SysUser sysUser1 = sysUserService.getUserByName(username);
if (sysUser1 != null) {
result.setMessage("用户名已注册");
result.setSuccess(false);
return result;
}
SysUser sysUser2 = sysUserService.getUserByPhone(phone);
if (sysUser2 != null) {
result.setMessage("该手机号已注册");
result.setSuccess(false);
return result;
}
String email = jsonObject.getString("email");
SysUser sysUser1 = sysUserService.getUserByName(username);
if (sysUser1 != null) {
result.setMessage("用户名已注册");
result.setSuccess(false);
return result;
}
SysUser sysUser2 = sysUserService.getUserByPhone(phone);
if (sysUser2 != null) {
result.setMessage("该手机号已注册");
result.setSuccess(false);
return result;
}
if(oConvertUtils.isNotEmpty(email)){
if(oConvertUtils.isNotEmpty(email)){
SysUser sysUser3 = sysUserService.getUserByEmail(email);
if (sysUser3 != null) {
result.setMessage("邮箱已被注册");
@@ -1032,66 +1037,66 @@ public class SysUserController {
result.setSuccess(false);
return result;
}
if (!smscode.equals(code.toString())) {
result.setMessage("手机验证码错误");
result.setSuccess(false);
return result;
}
if (!smscode.equals(code.toString())) {
result.setMessage("手机验证码错误");
result.setSuccess(false);
return result;
}
try {
user.setCreateTime(new Date());// 设置创建时间
String salt = UUIDUtils.randomUUID(8);
String passwordEncode = PasswordUtil.encrypt(username, password, salt);
user.setSalt(salt);
user.setUsername(username);
user.setRealname(username);
user.setPassword(passwordEncode);
user.setEmail(email);
user.setPhone(phone);
user.setStatus(CommonConstant.USER_UNFREEZE);
user.setDelFlag(CommonConstant.DEL_FLAG_0);
user.setActivitiSync(CommonConstant.ACT_SYNC_0);
sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test
result.setMessage("注册成功");
} catch (Exception e) {
try {
user.setCreateTime(new Date());// 设置创建时间
String salt = UUIDUtils.randomUUID(8);
String passwordEncode = PasswordUtil.encrypt(username, password, salt);
user.setSalt(salt);
user.setUsername(username);
user.setRealname(username);
user.setPassword(passwordEncode);
user.setEmail(email);
user.setPhone(phone);
user.setStatus(CommonConstant.USER_UNFREEZE);
user.setDelFlag(CommonConstant.DEL_FLAG_0);
user.setActivitiSync(CommonConstant.ACT_SYNC_0);
sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test
result.setMessage("注册成功");
} catch (Exception e) {
return Result.error("注册失败");
}
return result;
}
}
return result;
}
/**
* 用户手机号验证
*/
@PostMapping("/phoneVerification")
public Result<Map<String,String>> phoneVerification(@RequestBody JSONObject jsonObject) {
Result<Map<String,String>> result = new Result<>();
String phone = jsonObject.getString(PHONE);
String smscode = jsonObject.getString(SMSCODE);
Object code = redisUtil.get(phone);
if (!smscode.equals(code)) {
result.setMessage("手机验证码错误");
result.setSuccess(false);
return result;
}
//设置有效时间
redisUtil.set(phone, smscode,600);
//新增查询用户名
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
/**
* 用户手机号验证
*/
@PostMapping("/phoneVerification")
public Result<Map<String,String>> phoneVerification(@RequestBody JSONObject jsonObject) {
Result<Map<String,String>> result = new Result<>();
String phone = jsonObject.getString(PHONE);
String smscode = jsonObject.getString(SMSCODE);
Object code = redisUtil.get(phone);
if (!smscode.equals(code)) {
result.setMessage("手机验证码错误");
result.setSuccess(false);
return result;
}
//设置有效时间
redisUtil.set(phone, smscode,600);
//新增查询用户名
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
query.eq(SysUser::getPhone,phone);
SysUser user = sysUserService.getOne(query);
Map<String,String> map = new HashMap<>();
map.put(SMSCODE,smscode);
map.put(USER_NAME,user.getUsername());
result.setResult(map);
result.setSuccess(true);
return result;
}
result.setSuccess(true);
return result;
}
/**
* 用户更改密码
*/
@GetMapping("/passwordChange")
public Result<SysUser> passwordChange(@RequestParam(name=USER_NAME)String username,
/**
* 用户更改密码
*/
@GetMapping("/passwordChange")
public Result<SysUser> passwordChange(@RequestParam(name=USER_NAME)String username,
@RequestParam(name="password")String password,
@RequestParam(name="smscode")String smscode,
@RequestParam(name="phone") String phone) {
@@ -1105,12 +1110,12 @@ public class SysUserController {
SysUser sysUser;
Object object= redisUtil.get(phone);
if(null==object) {
result.setMessage("短信验证码失效！");
result.setMessage("短信验证码失效！");
result.setSuccess(false);
return result;
}
if(!smscode.equals(object.toString())) {
result.setMessage("短信验证码不匹配！");
result.setMessage("短信验证码不匹配！");
result.setSuccess(false);
return result;
}
@@ -1132,62 +1137,62 @@ public class SysUserController {
}
/**
* 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
*
* @return
*/
@GetMapping("/getUserSectionInfoByToken")
public Result<Map<String, Object>> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) {
try {
String username = null;
// 如果没有传递token，就从header中获取token并获取用户信息
if (oConvertUtils.isEmpty(token)) {
username = JwtUtil.getUserNameByToken(request);
} else {
username = JwtUtil.getUsername(token);
}
/**
* 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
*
* @return
*/
@GetMapping("/getUserSectionInfoByToken")
public Result<Map<String, Object>> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) {
try {
String username = null;
// 如果没有传递token，就从header中获取token并获取用户信息
if (oConvertUtils.isEmpty(token)) {
username = JwtUtil.getUserNameByToken(request);
} else {
username = JwtUtil.getUsername(token);
}
SysUserController.log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
SysUserController.log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
// 根据用户名查询用户信息
SysUser sysUser = sysUserService.getUserByName(username);
Map<String, Object> map = new HashMap<>();
map.put("sysUserId", sysUser.getId());
map.put("sysUserCode", sysUser.getUsername()); // 当前登录用户登录账号
map.put("sysUserName", sysUser.getRealname()); // 当前登录用户真实名称
map.put("sysOrgCode", sysUser.getOrgCode()); // 当前登录用户部门编号
// 根据用户名查询用户信息
SysUser sysUser = sysUserService.getUserByName(username);
Map<String, Object> map = new HashMap<>();
map.put("sysUserId", sysUser.getId());
map.put("sysUserCode", sysUser.getUsername()); // 当前登录用户登录账号
map.put("sysUserName", sysUser.getRealname()); // 当前登录用户真实名称
map.put("sysOrgCode", sysUser.getOrgCode()); // 当前登录用户部门编号
SysUserController.log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map);
SysUserController.log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map);
return Result.OK(map);
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage());
}
}
return Result.OK(map);
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage());
}
}
/**
* 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配
* @param keyword
* @param pageNo
* @param pageSize
* @return
*/
@GetMapping("/appUserList")
public Result<IPage<SysUser>> appUserList(@RequestParam(name = "keyword", required = false) String keyword,
/**
* 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配
* @param keyword
* @param pageNo
* @param pageSize
* @return
*/
@GetMapping("/appUserList")
public Result<IPage<SysUser>> appUserList(@RequestParam(name = "keyword", required = false) String keyword,
@RequestParam(name = USER_NAME, required = false) String username,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name = "syncFlow", required = false) String syncFlow) {
try {
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
if(oConvertUtils.isNotEmpty(syncFlow)){
try {
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
if(oConvertUtils.isNotEmpty(syncFlow)){
query.eq(SysUser::getActivitiSync, CommonConstant.ACT_SYNC_1);
}
query.eq(SysUser::getDelFlag,CommonConstant.DEL_FLAG_0);
if(oConvertUtils.isNotEmpty(username)){
if(username.contains(",")){
query.eq(SysUser::getDelFlag,CommonConstant.DEL_FLAG_0);
if(oConvertUtils.isNotEmpty(username)){
if(username.contains(",")){
query.in(SysUser::getUsername,Arrays.asList(username.split(",")));
}else{
query.eq(SysUser::getUsername,username);
@@ -1195,15 +1200,15 @@ public class SysUserController {
}else{
query.and(i -> i.like(SysUser::getUsername, keyword).or().like(SysUser::getRealname, keyword));
}
Page<SysUser> page = new Page<>(pageNo, pageSize);
IPage<SysUser> res = this.sysUserService.page(page, query);
return Result.OK(res);
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage());
}
Page<SysUser> page = new Page<>(pageNo, pageSize);
IPage<SysUser> res = this.sysUserService.page(page, query);
return Result.OK(res);
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage());
}
}
}
/**
* 获取被逻辑删除的用户列表，无分页
laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+8 -1
View File
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.enums.FinishFlagEnum;
@@ -118,7 +120,12 @@ public class WorkCenterController {
public Result<?> getApprovalRecordList(ProcessApprovalRecord processApprovalRecord,
HttpServletRequest req) {
Page<ProcessApprovalRecord> page = new Page<>(1, Integer.MAX_VALUE);
Page<ProcessApprovalRecord> pageList = processApprovalRecordService.pageList(page, processApprovalRecord, req);
Page<ProcessApprovalRecord> pageList;
try {
pageList = processApprovalRecordService.pageList(page, processApprovalRecord, req);
}catch (Exception e){
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
}
return Result.OK(pageList);
}