From c941194dea369214890184ab89623cd3fcf78452 Mon Sep 17 00:00:00 2001 From: ma-zhongxu Date: Wed, 14 Jan 2026 15:17:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=A1=8C=E6=94=BF=E5=8C=BA?= =?UTF-8?q?=E5=88=92=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=202.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E8=A1=8C=E6=94=BF=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD=203.?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9F=A2=E9=87=8F=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysAreaController.java | 123 +++ .../controller/system/SysUserController.java | 41 +- .../common/core/domain/entity/SysArea.java | 177 +++++ .../common/core/domain/entity/SysUser.java | 24 +- .../chenhai/system/mapper/SysAreaMapper.java | 61 ++ .../chenhai/system/mapper/SysUserMapper.java | 2 + .../system/service/ISysAreaService.java | 61 ++ .../system/service/ISysUserService.java | 9 + .../service/impl/SysAreaServiceImpl.java | 96 +++ .../service/impl/SysUserServiceImpl.java | 6 + .../resources/mapper/system/SysAreaMapper.xml | 116 +++ .../resources/mapper/system/SysUserMapper.xml | 45 ++ chenhai-ui/src/api/system/area.js | 63 ++ chenhai-ui/src/api/system/user.js | 29 + chenhai-ui/src/assets/icons/svg/userinfo.svg | 1 + chenhai-ui/src/views/system/area/index.vue | 426 ++++++++++ .../src/views/system/userInfo/index.vue | 736 ++++++++++++++++++ 17 files changed, 2003 insertions(+), 13 deletions(-) create mode 100644 chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysAreaController.java create mode 100644 chenhai-common/src/main/java/com/chenhai/common/core/domain/entity/SysArea.java create mode 100644 chenhai-system/src/main/java/com/chenhai/system/mapper/SysAreaMapper.java create mode 100644 chenhai-system/src/main/java/com/chenhai/system/service/ISysAreaService.java create mode 100644 chenhai-system/src/main/java/com/chenhai/system/service/impl/SysAreaServiceImpl.java create mode 100644 chenhai-system/src/main/resources/mapper/system/SysAreaMapper.xml create mode 100644 chenhai-ui/src/api/system/area.js create mode 100644 chenhai-ui/src/assets/icons/svg/userinfo.svg create mode 100644 chenhai-ui/src/views/system/area/index.vue create mode 100644 chenhai-ui/src/views/system/userInfo/index.vue diff --git a/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysAreaController.java b/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysAreaController.java new file mode 100644 index 0000000..be5ee26 --- /dev/null +++ b/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysAreaController.java @@ -0,0 +1,123 @@ +package com.chenhai.web.controller.system; + +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.chenhai.common.annotation.Log; +import com.chenhai.common.core.controller.BaseController; +import com.chenhai.common.core.domain.AjaxResult; +import com.chenhai.common.enums.BusinessType; +import com.chenhai.common.core.domain.entity.SysArea; +import com.chenhai.system.service.ISysAreaService; +import com.chenhai.common.utils.poi.ExcelUtil; +import com.chenhai.common.core.page.TableDataInfo; + +/** + * 行政区划Controller + * + * @author ruoyi + * @date 2026-01-09 + */ +@RestController +@RequestMapping("/system/area") +public class SysAreaController extends BaseController +{ + @Autowired + private ISysAreaService sysAreaService; + + /** + * 查询行政区划列表 + */ + @PreAuthorize("@ss.hasPermi('system:area:list')") + @GetMapping("/list") + public TableDataInfo list(SysArea sysArea) + { + startPage(); + List list = sysAreaService.selectSysAreaList(sysArea); + return getDataTable(list); + } + + /** + * 导出行政区划列表 + */ + @PreAuthorize("@ss.hasPermi('system:area:export')") + @Log(title = "行政区划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SysArea sysArea) + { + List list = sysAreaService.selectSysAreaList(sysArea); + ExcelUtil util = new ExcelUtil(SysArea.class); + util.exportExcel(response, list, "行政区划数据"); + } + + /** + * 获取行政区划详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:area:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(sysAreaService.selectSysAreaById(id)); + } + + /** + * 新增行政区划 + */ + @PreAuthorize("@ss.hasPermi('system:area:add')") + @Log(title = "行政区划", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysArea sysArea) + { + return toAjax(sysAreaService.insertSysArea(sysArea)); + } + + /** + * 修改行政区划 + */ + @PreAuthorize("@ss.hasPermi('system:area:edit')") + @Log(title = "行政区划", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysArea sysArea) + { + return toAjax(sysAreaService.updateSysArea(sysArea)); + } + + /** + * 删除行政区划 + */ + @PreAuthorize("@ss.hasPermi('system:area:remove')") + @Log(title = "行政区划", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(sysAreaService.deleteSysAreaByIds(ids)); + } + + /** + * 懒加载查询子节点 + */ + @PreAuthorize("@ss.hasPermi('system:area:list')") + @GetMapping("/children") + public AjaxResult getChildren(@RequestParam(value = "parentCode", required = false, defaultValue = "152900") String parentCode) { + SysArea query = new SysArea(); + query.setParentCode(parentCode); + query.setDeleted(0); + List list = sysAreaService.selectSysAreaList(query); + return success(list); + } + + /** + * 获取所有省级节点（type=2的就是省级） + */ + @PreAuthorize("@ss.hasPermi('system:area:list')") + @GetMapping("/provinces") + public AjaxResult getProvinces() { + SysArea query = new SysArea(); + query.setType(2); // 省级 + query.setDeleted(0); + List list = sysAreaService.selectSysAreaList(query); + return success(list); + } +} diff --git a/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysUserController.java b/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysUserController.java index 8933b71..d02605b 100644 --- a/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysUserController.java +++ b/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysUserController.java @@ -2,19 +2,15 @@ package com.chenhai.web.controller.system; import java.util.List; import java.util.stream.Collectors; + +import com.chenhai.common.core.domain.entity.SysArea; +import com.chenhai.system.service.*; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import com.chenhai.common.annotation.Log; import com.chenhai.common.core.controller.BaseController; @@ -27,10 +23,6 @@ import com.chenhai.common.enums.BusinessType; import com.chenhai.common.utils.SecurityUtils; import com.chenhai.common.utils.StringUtils; import com.chenhai.common.utils.poi.ExcelUtil; -import com.chenhai.system.service.ISysDeptService; -import com.chenhai.system.service.ISysPostService; -import com.chenhai.system.service.ISysRoleService; -import com.chenhai.system.service.ISysUserService; /** * 用户信息 @@ -53,6 +45,9 @@ public class SysUserController extends BaseController @Autowired private ISysPostService postService; + @Autowired + private ISysAreaService sysAreaService; + /** * 获取用户列表 */ @@ -65,6 +60,15 @@ public class SysUserController extends BaseController return getDataTable(list); } + @PreAuthorize("@ss.hasPermi('system:user:list')") + @GetMapping("/listByAreaCode") + public TableDataInfo listByAreaCode(SysUser user) + { + startPage(); + List list = userService.selectUserListByAreaCode(user); + return getDataTable(list); + } + @Log(title = "用户管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @PostMapping("/export") @@ -253,4 +257,17 @@ public class SysUserController extends BaseController { return success(deptService.selectDeptTreeList(dept)); } + + /** + * 获取区划树列表 + */ + @PreAuthorize("@ss.hasPermi('system:user:list')") + @GetMapping("/areaChildren") + public AjaxResult getAreaChildren(@RequestParam(value = "parentCode", required = false, defaultValue = "152900") String parentCode) { + SysArea query = new SysArea(); + query.setParentCode(parentCode); + query.setDeleted(0); + List list = sysAreaService.selectSysAreaList(query); + return success(list); + } } diff --git a/chenhai-common/src/main/java/com/chenhai/common/core/domain/entity/SysArea.java b/chenhai-common/src/main/java/com/chenhai/common/core/domain/entity/SysArea.java new file mode 100644 index 0000000..8645941 --- /dev/null +++ b/chenhai-common/src/main/java/com/chenhai/common/core/domain/entity/SysArea.java @@ -0,0 +1,177 @@ +package com.chenhai.common.core.domain.entity; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.chenhai.common.annotation.Excel; +import com.chenhai.common.core.domain.BaseEntity; + +/** + * 行政区划对象 sys_area + * + * @author ruoyi + * @date 2026-01-09 + */ +public class SysArea extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 自增ID */ + private Long id; + + /** 名称 */ + @Excel(name = "名称") + private String name; + + /** 编码 */ + @Excel(name = "编码") + private String code; + + /** 父节点编码 */ + @Excel(name = "父节点编码") + private String parentCode; + + /** 节点类型（1：国；2：省；3：市；4：县；5：街道；6：村） */ + @Excel(name = "节点类型", readConverterExp = "1=：国；2：省；3：市；4：县；5：街道；6：村") + private Integer type; + + /** 显示顺序 */ + @Excel(name = "显示顺序") + private Long sort; + + /** 行政区划节点状态（0：开启，1：关闭） */ + @Excel(name = "行政区划节点状态", readConverterExp = "0=：开启，1：关闭") + private Integer status; + + /** 全名称 */ + @Excel(name = "全名称") + private String namePath; + + /** 全编码 */ + @Excel(name = "全编码") + private String codePath; + + /** 是否删除 */ + @Excel(name = "是否删除") + private Integer deleted; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public void setCode(String code) + { + this.code = code; + } + + public String getCode() + { + return code; + } + + public void setParentCode(String parentCode) + { + this.parentCode = parentCode; + } + + public String getParentCode() + { + return parentCode; + } + + public void setType(Integer type) + { + this.type = type; + } + + public Integer getType() + { + return type; + } + + public void setSort(Long sort) + { + this.sort = sort; + } + + public Long getSort() + { + return sort; + } + + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + + public void setNamePath(String namePath) + { + this.namePath = namePath; + } + + public String getNamePath() + { + return namePath; + } + + public void setCodePath(String codePath) + { + this.codePath = codePath; + } + + public String getCodePath() + { + return codePath; + } + + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("code", getCode()) + .append("parentCode", getParentCode()) + .append("type", getType()) + .append("sort", getSort()) + .append("status", getStatus()) + .append("namePath", getNamePath()) + .append("codePath", getCodePath()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deleted", getDeleted()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/chenhai-common/src/main/java/com/chenhai/common/core/domain/entity/SysUser.java b/chenhai-common/src/main/java/com/chenhai/common/core/domain/entity/SysUser.java index f5c55e9..39f777b 100644 --- a/chenhai-common/src/main/java/com/chenhai/common/core/domain/entity/SysUser.java +++ b/chenhai-common/src/main/java/com/chenhai/common/core/domain/entity/SysUser.java @@ -39,7 +39,7 @@ public class SysUser extends BaseEntity private String nickName; /** 用户类型 */ - @Excel(name = "用户类型", readConverterExp = "00=系统用户,01=注册用户") + @Excel(name = "用户类型", readConverterExp = "00=系统用户,01=兽医用户,02=牧户用户") private String userType; /** 用户邮箱 */ @@ -78,6 +78,10 @@ public class SysUser extends BaseEntity /** 密码最后更新时间 */ private Date pwdUpdateDate; + /** 行政区划 */ + @Excel(name = "行政区划") + private String areaCode; + /** 部门对象 */ @Excels({ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), @@ -85,6 +89,8 @@ public class SysUser extends BaseEntity }) private SysDept dept; + private SysArea area; + /** 角色对象 */ private List roles; @@ -274,6 +280,14 @@ public class SysUser extends BaseEntity this.pwdUpdateDate = pwdUpdateDate; } + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + public SysDept getDept() { return dept; @@ -284,6 +298,14 @@ public class SysUser extends BaseEntity this.dept = dept; } + public SysArea getArea() { + return area; + } + + public void setArea(SysArea area) { + this.area = area; + } + public List getRoles() { return roles; diff --git a/chenhai-system/src/main/java/com/chenhai/system/mapper/SysAreaMapper.java b/chenhai-system/src/main/java/com/chenhai/system/mapper/SysAreaMapper.java new file mode 100644 index 0000000..d2494df --- /dev/null +++ b/chenhai-system/src/main/java/com/chenhai/system/mapper/SysAreaMapper.java @@ -0,0 +1,61 @@ +package com.chenhai.system.mapper; + +import java.util.List; +import com.chenhai.common.core.domain.entity.SysArea; + +/** + * 行政区划Mapper接口 + * + * @author ruoyi + * @date 2026-01-09 + */ +public interface SysAreaMapper +{ + /** + * 查询行政区划 + * + * @param id 行政区划主键 + * @return 行政区划 + */ + public SysArea selectSysAreaById(Long id); + + /** + * 查询行政区划列表 + * + * @param sysArea 行政区划 + * @return 行政区划集合 + */ + public List selectSysAreaList(SysArea sysArea); + + /** + * 新增行政区划 + * + * @param sysArea 行政区划 + * @return 结果 + */ + public int insertSysArea(SysArea sysArea); + + /** + * 修改行政区划 + * + * @param sysArea 行政区划 + * @return 结果 + */ + public int updateSysArea(SysArea sysArea); + + /** + * 删除行政区划 + * + * @param id 行政区划主键 + * @return 结果 + */ + public int deleteSysAreaById(Long id); + + /** + * 批量删除行政区划 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSysAreaByIds(Long[] ids); +} diff --git a/chenhai-system/src/main/java/com/chenhai/system/mapper/SysUserMapper.java b/chenhai-system/src/main/java/com/chenhai/system/mapper/SysUserMapper.java index d585b92..ccd832b 100644 --- a/chenhai-system/src/main/java/com/chenhai/system/mapper/SysUserMapper.java +++ b/chenhai-system/src/main/java/com/chenhai/system/mapper/SysUserMapper.java @@ -20,6 +20,8 @@ public interface SysUserMapper */ public List selectUserList(SysUser sysUser); + List selectUserListByAreaCode(SysUser user); + /** * 根据条件分页查询已配用户角色列表 * diff --git a/chenhai-system/src/main/java/com/chenhai/system/service/ISysAreaService.java b/chenhai-system/src/main/java/com/chenhai/system/service/ISysAreaService.java new file mode 100644 index 0000000..598d972 --- /dev/null +++ b/chenhai-system/src/main/java/com/chenhai/system/service/ISysAreaService.java @@ -0,0 +1,61 @@ +package com.chenhai.system.service; + +import java.util.List; +import com.chenhai.common.core.domain.entity.SysArea; + +/** + * 行政区划Service接口 + * + * @author ruoyi + * @date 2026-01-09 + */ +public interface ISysAreaService +{ + /** + * 查询行政区划 + * + * @param id 行政区划主键 + * @return 行政区划 + */ + public SysArea selectSysAreaById(Long id); + + /** + * 查询行政区划列表 + * + * @param sysArea 行政区划 + * @return 行政区划集合 + */ + public List selectSysAreaList(SysArea sysArea); + + /** + * 新增行政区划 + * + * @param sysArea 行政区划 + * @return 结果 + */ + public int insertSysArea(SysArea sysArea); + + /** + * 修改行政区划 + * + * @param sysArea 行政区划 + * @return 结果 + */ + public int updateSysArea(SysArea sysArea); + + /** + * 批量删除行政区划 + * + * @param ids 需要删除的行政区划主键集合 + * @return 结果 + */ + public int deleteSysAreaByIds(Long[] ids); + + /** + * 删除行政区划信息 + * + * @param id 行政区划主键 + * @return 结果 + */ + public int deleteSysAreaById(Long id); +} diff --git a/chenhai-system/src/main/java/com/chenhai/system/service/ISysUserService.java b/chenhai-system/src/main/java/com/chenhai/system/service/ISysUserService.java index a9190f4..818753a 100644 --- a/chenhai-system/src/main/java/com/chenhai/system/service/ISysUserService.java +++ b/chenhai-system/src/main/java/com/chenhai/system/service/ISysUserService.java @@ -19,6 +19,14 @@ public interface ISysUserService */ public List selectUserList(SysUser user); + /** + * 根据条件分页查询用户列表(关联行政区划表) + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + List selectUserListByAreaCode(SysUser user); + /** * 根据条件分页查询已分配用户角色列表 * @@ -222,4 +230,5 @@ public interface ISysUserService * @return 结果 */ public String importUser(List userList, Boolean isUpdateSupport, String operName); + } diff --git a/chenhai-system/src/main/java/com/chenhai/system/service/impl/SysAreaServiceImpl.java b/chenhai-system/src/main/java/com/chenhai/system/service/impl/SysAreaServiceImpl.java new file mode 100644 index 0000000..f6503e1 --- /dev/null +++ b/chenhai-system/src/main/java/com/chenhai/system/service/impl/SysAreaServiceImpl.java @@ -0,0 +1,96 @@ +package com.chenhai.system.service.impl; + +import java.util.List; +import com.chenhai.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.chenhai.system.mapper.SysAreaMapper; +import com.chenhai.common.core.domain.entity.SysArea; +import com.chenhai.system.service.ISysAreaService; + +/** + * 行政区划Service业务层处理 + * + * @author ruoyi + * @date 2026-01-09 + */ +@Service +public class SysAreaServiceImpl implements ISysAreaService +{ + @Autowired + private SysAreaMapper sysAreaMapper; + + /** + * 查询行政区划 + * + * @param id 行政区划主键 + * @return 行政区划 + */ + @Override + public SysArea selectSysAreaById(Long id) + { + return sysAreaMapper.selectSysAreaById(id); + } + + /** + * 查询行政区划列表 + * + * @param sysArea 行政区划 + * @return 行政区划 + */ + @Override + public List selectSysAreaList(SysArea sysArea) + { + return sysAreaMapper.selectSysAreaList(sysArea); + } + + /** + * 新增行政区划 + * + * @param sysArea 行政区划 + * @return 结果 + */ + @Override + public int insertSysArea(SysArea sysArea) + { + sysArea.setCreateTime(DateUtils.getNowDate()); + return sysAreaMapper.insertSysArea(sysArea); + } + + /** + * 修改行政区划 + * + * @param sysArea 行政区划 + * @return 结果 + */ + @Override + public int updateSysArea(SysArea sysArea) + { + sysArea.setUpdateTime(DateUtils.getNowDate()); + return sysAreaMapper.updateSysArea(sysArea); + } + + /** + * 批量删除行政区划 + * + * @param ids 需要删除的行政区划主键 + * @return 结果 + */ + @Override + public int deleteSysAreaByIds(Long[] ids) + { + return sysAreaMapper.deleteSysAreaByIds(ids); + } + + /** + * 删除行政区划信息 + * + * @param id 行政区划主键 + * @return 结果 + */ + @Override + public int deleteSysAreaById(Long id) + { + return sysAreaMapper.deleteSysAreaById(id); + } +} diff --git a/chenhai-system/src/main/java/com/chenhai/system/service/impl/SysUserServiceImpl.java b/chenhai-system/src/main/java/com/chenhai/system/service/impl/SysUserServiceImpl.java index 61d9c11..d18dab5 100644 --- a/chenhai-system/src/main/java/com/chenhai/system/service/impl/SysUserServiceImpl.java +++ b/chenhai-system/src/main/java/com/chenhai/system/service/impl/SysUserServiceImpl.java @@ -79,6 +79,12 @@ public class SysUserServiceImpl implements ISysUserService return userMapper.selectUserList(user); } + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectUserListByAreaCode(SysUser user) { + return userMapper.selectUserListByAreaCode(user); + } + /** * 根据条件分页查询已分配用户角色列表 * diff --git a/chenhai-system/src/main/resources/mapper/system/SysAreaMapper.xml b/chenhai-system/src/main/resources/mapper/system/SysAreaMapper.xml new file mode 100644 index 0000000..c0b7e15 --- /dev/null +++ b/chenhai-system/src/main/resources/mapper/system/SysAreaMapper.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, name, code, parent_code, type, sort, status, name_path, code_path, create_by, create_time, update_by, update_time, deleted, remark from sys_area + + + + + + + + insert into sys_area + + name, + code, + parent_code, + type, + sort, + status, + name_path, + code_path, + create_by, + create_time, + update_by, + update_time, + deleted, + remark, + + + #{name}, + #{code}, + #{parentCode}, + #{type}, + #{sort}, + #{status}, + #{namePath}, + #{codePath}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{deleted}, + #{remark}, + + + + + update sys_area + + name = #{name}, + code = #{code}, + parent_code = #{parentCode}, + type = #{type}, + sort = #{sort}, + status = #{status}, + name_path = #{namePath}, + code_path = #{codePath}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + deleted = #{deleted}, + remark = #{remark}, + + where id = #{id} + + + + delete from sys_area where id = #{id} + + + + delete from sys_area where id in + + #{id} + + + \ No newline at end of file diff --git a/chenhai-system/src/main/resources/mapper/system/SysUserMapper.xml b/chenhai-system/src/main/resources/mapper/system/SysUserMapper.xml index 024f901..6b04d1c 100644 --- a/chenhai-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/chenhai-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -19,12 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -46,6 +49,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, @@ -85,6 +101,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} + +