查询添加模糊查询

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -1,7 +1,6 @@
 package com.xunmei.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.xunmei.common.core.constant.UserConstants;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -9,7 +8,6 @@ import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.common.security.utils.SecurityUtils;
-import com.xunmei.system.api.domain.SysDept;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.service.ISysDeptService;
@@ -46,7 +44,12 @@ public class SysDeptController extends BaseController
     @GetMapping("/list")
     public AjaxResult list(SysOrg dept)
     {
-        List<SysOrg> depts = orgService.list(new QueryWrapper<>(dept));
+        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>(dept);
+        if (StringUtils.isNotNull(dept.getName())){
+            queryWrapper.like("name",dept.getName());
+            dept.setName(null);
+        }
+        List<SysOrg> depts = orgService.list(queryWrapper);
         return success(depts);
     }
 
@@ -101,11 +104,12 @@ public class SysDeptController extends BaseController
     {
         Long deptId = dept.getId();
 //        deptService.checkDeptDataScope(deptId);
-        if (orgService.list(new QueryWrapper<SysOrg>().eq("name",dept.getName()).eq("deleted",0L)).size()>0)
+        if (orgService.list(new QueryWrapper<SysOrg>().eq("name",dept.getName()).eq("deleted",0L)).size()>1)
         {
             return error("修改部门'" + dept.getName() + "'失败，部门名称已存在");
         }
-        else if (dept.getParentId().equals(deptId))
+        else
+            if (dept.getParentId().equals(deptId))
         {
             return error("修改部门'" + dept.getName() + "'失败，上级部门不能是自己");
         }
@@ -115,7 +119,7 @@ public class SysDeptController extends BaseController
 //        }
         dept.setUpdateBy(SecurityUtils.getUsername());
         dept.setUpdateTime(new Date());
-        return toAjax(orgService.update(new QueryWrapper<>(dept)));
+        return toAjax(orgService.updateById(dept));
     }
 
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -164,6 +164,13 @@ public class SysUserController extends BaseController {
 //        {
 //            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
 //        }
+        if (user.getRoleIds()!=null&&user.getRoleIds().length > 0) {
+            for (Long roleId :
+                    user.getRoleIds()) {
+                sysUserRoleService.insertSysUserRole(new SysUserRole(user.getId(), roleId));
+            }
+
+        }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setCreateTime(new Date());
         //isp的加密方式
@@ -192,6 +199,14 @@ public class SysUserController extends BaseController {
 //        {
 //            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
 //        }
+        if (user.getRoleIds()!=null&&user.getRoleIds().length > 0) {
+            sysUserRoleService.remove(new QueryWrapper<SysUserRole>().eq("user_id", user.getId()));
+            for (Long roleId :
+                    user.getRoleIds()) {
+                sysUserRoleService.insertSysUserRole(new SysUserRole(user.getId(), roleId));
+            }
+
+        }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));
     }
@@ -248,7 +263,7 @@ public class SysUserController extends BaseController {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
-        List<SysUserRole>userRoles=sysUserRoleService.selectSysUserRoleListByUserId(userId);
+        List<SysUserRole> userRoles = sysUserRoleService.selectSysUserRoleListByUserId(userId);
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("userRoles", userRoles);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysUserRole.java

@@ -13,10 +13,17 @@ public class SysUserRole extends BaseEntity
 {
     /** 用户ID */
     private Long userId;
-    
+
+    public SysUserRole() {
+    }
+
     /** 角色ID */
     private Long roleId;
 
+    public SysUserRole(Long id, Long roleId) {
+        super();
+    }
+
     public Long getUserId()
     {
         return userId;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDictDataServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.system.api.domain.SysDept;
@@ -44,6 +45,7 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
             page = new Page<>();
         }
         QueryWrapper<SysDictData> where = new QueryWrapper<>(dictData);
+
         Page<SysDictData> list = dictDataMapper.selectPage(page, where);
         TableDataInfo rspData = new TableDataInfo();
         rspData.setRows(list.getRecords());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDictTypeServiceImpl.java

@@ -63,6 +63,11 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
             page = new Page<>();
         }
         QueryWrapper<SysDictType> where = new QueryWrapper<>(dictType);
+        //模糊查询
+        if (StringUtils.isNotNull(dictType.getDictName())){
+            where.like("dict_name",dictType.getDictName());
+            dictType.setDictName(null);
+        }
         Page<SysDictType> list = dictTypeMapper.selectPage(page, where);
         TableDataInfo rspData = new TableDataInfo();
         rspData.setRows(list.getRecords());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -96,11 +96,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             user.setOrgId(null);
             //添加in条件
             query.in("org_id",ids);
+
         }
         //时间范围查询
         if (user.getParams().get("beginTime")!=null&&user.getParams().get("endTime")!=null){
             query.between("create_time", user.getParams().get("beginTime"), user.getParams().get("endTime"));
         }
+        //模糊查询
+        if (StringUtils.isNotNull(user.getUsername())){
+            query.like("username",user.getUsername());
+            user.setUsername(null);
+        }
         //获取数据
         page = userMapper.selectPage(page, query);
         //抓换为TableDataInfo适配前端