From 4d2c541016bf2407b08ac95c539e9d7e9f271a8a Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 7 Nov 2024 11:38:19 +0800 Subject: [PATCH] 11 --- .../apiadmin/SysAuthorizeGroupRest.java | 54 +++++++ .../com/yxt/portal/apiadmin/SysMenuRest.java | 8 +- .../portal/apiadmin/SysOrgAuthorizeRest.java | 55 ++++++- .../portal/apiadmin/SysOrgRegisterRest.java | 24 +++ .../portal/apiadmin/SysRoleAuthorizeRest.java | 8 + .../com/yxt/portal/apiadmin/SysRoleRest.java | 1 - .../yxt/portal/apiadmin/SysSourceRest.java | 53 +++---- .../com/yxt/portal/apiadmin/SysUserRest.java | 41 +++-- .../sysauthorizegroup/SysAuthorizeGroup.java | 8 +- .../SysAuthorizeGroupDto.java | 52 +------ .../SysAuthorizeGroupMapper.java | 4 +- .../SysAuthorizeGroupMapper.xml | 27 +++- .../SysAuthorizeGroupQuery.java | 2 + .../SysAuthorizeGroupService.java | 91 +++++++++-- .../SysAuthorizeGroupVo.java | 52 +------ .../SysAuthorizeGroupDetail.java | 9 +- .../SysAuthorizeGroupDetailDto.java | 47 +----- .../SysAuthorizeGroupDetailMapper.java | 12 ++ .../SysAuthorizeGroupDetailMapper.xml | 30 +++- .../SysAuthorizeGroupDetailService.java | 84 +++++++++- .../SysAuthorizeGroupDetailVo.java | 49 +----- .../yxt/portal/biz/sysmenu/SysMenuMapper.xml | 12 +- .../portal/biz/sysmenu/SysMenuService.java | 16 +- .../SysOrganizationMapper.java | 1 + .../sysorganization/SysOrganizationMapper.xml | 8 + .../SysOrganizationService.java | 9 +- .../biz/sysorgauthorize/SysOrgAuthorize.java | 7 +- .../sysorgauthorize/SysOrgAuthorizeDto.java | 8 +- .../SysOrgAuthorizeMapper.java | 9 +- .../sysorgauthorize/SysOrgAuthorizeMapper.xml | 51 +++++- .../sysorgauthorize/SysOrgAuthorizeQuery.java | 3 +- .../SysOrgAuthorizeService.java | 145 +++++++++++------- .../sysorgauthorize/SysOrgAuthorizeVo.java | 11 +- .../sysorgauthorize/SysOrgAuthorizeVo2.java | 18 +++ .../biz/sysorgregister/SysOrgRegister.java | 2 +- .../biz/sysorgregister/SysOrgRegisterDto.java | 4 +- .../sysorgregister/SysOrgRegisterService.java | 19 ++- .../biz/sysorgregister/SysOrgRegisterVo.java | 2 +- .../yxt/portal/biz/sysrole/SysRoleMapper.xml | 4 +- .../com/yxt/portal/biz/sysrole/SysRoleVo.java | 2 + .../SysRoleAuthorizeMapper.java | 2 +- .../SysRoleAuthorizeMapper.xml | 8 + .../SysRoleAuthorizeService.java | 34 ++++ .../portal/biz/syssource/SysSourceDto.java | 3 +- .../biz/syssource/SysSourceService.java | 11 +- .../yxt/portal/biz/syssource/SysSourceVo.java | 2 +- .../yxt/portal/biz/sysuser/SysUserMapper.java | 1 + .../yxt/portal/biz/sysuser/SysUserMapper.xml | 115 ++++++++++++++ .../portal/biz/sysuser/SysUserService.java | 101 +++++++++++- 49 files changed, 976 insertions(+), 343 deletions(-) create mode 100644 src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo2.java diff --git a/src/main/java/com/yxt/portal/apiadmin/SysAuthorizeGroupRest.java b/src/main/java/com/yxt/portal/apiadmin/SysAuthorizeGroupRest.java index d552cff..a621f7f 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysAuthorizeGroupRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysAuthorizeGroupRest.java @@ -1,8 +1,62 @@ package com.yxt.portal.apiadmin; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.portal.biz.sysauthorizegroup.*; +import com.yxt.portal.utils.OrgPathQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + /** * @author wangpengfei * @date 2024/7/26 17:26 */ +@Api(tags = "权限组") +@RestController +@RequestMapping("apiadmin/sysauthorizegroup") public class SysAuthorizeGroupRest { + @Autowired + SysAuthorizeGroupService sysAuthorizeGroupService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return sysAuthorizeGroupService.listPage(pq); + } + @ApiOperation("查询所有的类别") + @GetMapping("/listAll") + public ResultBean> listAll() { + return sysAuthorizeGroupService.listAll(); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody SysAuthorizeGroupDto dto) { + return sysAuthorizeGroupService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return sysAuthorizeGroupService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return sysAuthorizeGroupService.delete(sid); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + sysAuthorizeGroupService.delAll(sids); + return rb.success(); + } } diff --git a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java index 54a8af0..fa14ac4 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java @@ -189,8 +189,12 @@ public class SysMenuRest { String a=""; List userRole=new ArrayList<>(); if(!sysOrganization.getPsid().equals("0")){ - a =sysOrganization.getOrgSidPath().substring(0,sysOrganization.getOrgSidPath().lastIndexOf("/")); - userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), a,""); + if(sysOrganization.getPsid().equals("x")){ + userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), "",""); + }else{ + a =sysOrganization.getOrgSidPath().substring(0,sysOrganization.getOrgSidPath().lastIndexOf("/")); + userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), a,""); + } }else{ // a=sysOrganization.getOrgSidPath(); userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), "",""); diff --git a/src/main/java/com/yxt/portal/apiadmin/SysOrgAuthorizeRest.java b/src/main/java/com/yxt/portal/apiadmin/SysOrgAuthorizeRest.java index 443903a..10e8425 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysOrgAuthorizeRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysOrgAuthorizeRest.java @@ -1,8 +1,15 @@ package com.yxt.portal.apiadmin; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.portal.biz.sysorgauthorize.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @author wangpengfei @@ -12,4 +19,48 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("apiadmin/sysorgauthorize") public class SysOrgAuthorizeRest { + @Autowired + SysOrgAuthorizeService sysOrgAuthorizeService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return sysOrgAuthorizeService.listPage(pq); + } + @ApiOperation("查询所有的类别") + @GetMapping("/listAll") + public ResultBean> listAll() { + return sysOrgAuthorizeService.listAll(); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody SysOrgAuthorizeDto dto) { + return sysOrgAuthorizeService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return sysOrgAuthorizeService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return sysOrgAuthorizeService.delete(sid); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + sysOrgAuthorizeService.delAll(sids); + return rb.success(); + } + @ApiOperation("获取注册信息") + @GetMapping("/getRegistrationInformation/{sid}") + public ResultBean getRegistrationInformation(@PathVariable("sid") String sid){ + return sysOrgAuthorizeService.getRegistrationInformation(sid); + } } diff --git a/src/main/java/com/yxt/portal/apiadmin/SysOrgRegisterRest.java b/src/main/java/com/yxt/portal/apiadmin/SysOrgRegisterRest.java index 074b97e..3c55ece 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysOrgRegisterRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysOrgRegisterRest.java @@ -1,8 +1,32 @@ package com.yxt.portal.apiadmin; +import com.yxt.common.core.result.ResultBean; +import com.yxt.portal.biz.sysorgauthorize.SysOrgAuthorizeDto; +import com.yxt.portal.biz.sysorgregister.SysOrgRegisterDto; +import com.yxt.portal.biz.sysorgregister.SysOrgRegisterService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + /** * @author wangpengfei * @date 2024/7/26 17:26 */ +@Api(tags = "组织授权表") +@RestController +@RequestMapping("apiadmin/sysorgregister") public class SysOrgRegisterRest { + @Autowired + SysOrgRegisterService sysOrgRegisterService; + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean saveOrUpdate(@RequestBody List dtos) { + return sysOrgRegisterService.saveOrUpdate(dtos); + } } diff --git a/src/main/java/com/yxt/portal/apiadmin/SysRoleAuthorizeRest.java b/src/main/java/com/yxt/portal/apiadmin/SysRoleAuthorizeRest.java index d5c0cf9..9d7ec5c 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysRoleAuthorizeRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysRoleAuthorizeRest.java @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @author wangpengfei * @date 2024/5/15 16:00 @@ -26,4 +28,10 @@ public class SysRoleAuthorizeRest { public ResultBean updateRoleAndMenu(@RequestBody SysRoleAuthorizeDto dto){ return sysRoleAuthorizeService.updateRoleAndMenu(dto); } + @ApiOperation("修改角色的菜单配置(管理后台)") + @PostMapping("/updateRoleAndMenuAdmin") + public ResultBean updateRoleAndMenuAdmin(@RequestBody List dtos){ + return sysRoleAuthorizeService.updateRoleAndMenuAdmin(dtos); + } + } diff --git a/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java b/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java index 7f6a5c2..53622a5 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java @@ -42,7 +42,6 @@ public class SysRoleRest { return rb.success().setData(pv); } - @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody SysRoleQuery query){ diff --git a/src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java b/src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java index 4d1d528..3d5473f 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java @@ -10,10 +10,9 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.portal.biz.syssource.*; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -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 javax.servlet.http.HttpServletRequest; import java.util.List; @@ -45,83 +44,81 @@ public class SysSourceRest { private SysSourceService sysSourceService; @Autowired private RedisUtil redisUtil; - + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ - String token = httpServletRequest.getHeader("token"); - String s = redisUtil.get(token); - SysUser sysUser = sysUserService.fetchByUserName(s); -// SystemLog systemLog = new SystemLog(); -// systemLog.setUserSid(sysUser.getSid()); -// systemLog.setCreateTime(new Date()); -// systemLog.setEventName("人员岗位保存"); -// systemLog.setEventContent(""); -// systemLog.setEventUrl("/portal/apiadmin/sysstaffpost/save"); -// systemLog.setUserIp("0.0.0.0"); -// systemLog.setUserName(sysUser.getUserName()); -// systemLogService.save(systemLog); ResultBean rb = ResultBean.fireFail(); PagerVo pv = sysSourceService.listPageVo(pq); return rb.success().setData(pv); } - + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") public ResultBean> listAll(@RequestBody SysSourceQuery query){ ResultBean rb = ResultBean.fireFail(); List list = sysSourceService.listAllVo(query); return rb.success().setData(list); } - + @ApiOperation("根据角色sid条件查询所有数据列表") + @PostMapping("/listAllByRoleSid") public ResultBean> listAllByRoleSid(SysSourceQuery query) { ResultBean rb = ResultBean.fireFail(); List list = sysSourceService.listAllByRoleSid(query); return rb.success().setData(list); } - + @ApiOperation("所有数据列表") + @GetMapping("/list") public ResultBean> list(){ ResultBean rb = ResultBean.fireFail(); List list = sysSourceService.listVo(""); return rb.success().setData(list); } - - public ResultBean save(SysSourceDto dto){ + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysSourceDto dto){ ResultBean rb = ResultBean.fireFail(); sysSourceService.saveOrUpdateDto(dto); return rb.success(); } - + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") public ResultBean update(SysSourceDto dto,String sid){ ResultBean rb = ResultBean.fireFail(); sysSourceService.updateBySid(dto.toMap(),sid); return rb.success(); } - - public ResultBean del(String ids){ + @ApiOperation("删除记录") + @DeleteMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids")String ids){ ResultBean rb = ResultBean.fireFail(); sysSourceService.delByIds(ids); return rb.success(); } - - public ResultBean delBySids(String sids) { + @ApiOperation("删除记录 根据sid") + @DeleteMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids")String sids) { ResultBean rb = ResultBean.fireFail(); String[] sidArr = sids.split(","); sysSourceService.delBySids(sidArr); return rb.success(); } - + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") public ResultBean fetch(String id){ ResultBean rb = ResultBean.fireFail(); SysSourceVo vo = sysSourceService.fetchByIdVo(id); return rb.success().setData(vo); } - + @ApiOperation("获取一条记录 根据sid") + @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); SysSourceVo vo = sysSourceService.fetchBySidVo(sid); diff --git a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java index 5d8467d..e60c020 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java @@ -107,6 +107,13 @@ public class SysUserRest { PagerVo pv = sysUserService.listPageVo(pq); return rb.success().setData(pv); } + @ApiOperation("根据条件分页查询数据的列表 ") + @PostMapping("/listPageVoAdmin") + public ResultBean> listPageVoAdmin(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail();//roleSid + PagerVo pv = sysUserService.listPageVoAdmin(pq); + return rb.success().setData(pv); + } @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") @@ -429,6 +436,9 @@ public class SysUserRest { } if(user.getAccountType().equals("3")){ return new ResultBean().fail().setMsg("此账号不能登录"); + }else if(user.getAccountType().equals("0")){ + SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user); + return new ResultBean<>().success().setData(userInfoOneVo); } }else{ //验证码登录 @@ -447,6 +457,9 @@ public class SysUserRest { } if(user.getAccountType().equals("3")){ return new ResultBean().fail().setMsg("此账号不能登录"); + }else if(user.getAccountType().equals("0")){ + SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user); + return new ResultBean<>().success().setData(userInfoOneVo); } } // 根据用户信息查询用户的角色信息 @@ -467,13 +480,9 @@ public class SysUserRest { //1>2 1 、1<2 -1 、1=2 0 int k= DateUtil.parse(sdf.format(DateUtil.parse(sdf.format(new Date())))).compareTo(DateUtil.parse(sdf.format(sysOrgRegister.getExpireDate()))); if(k==1){ - sysStaffOrgVo.setType("1"); + sysStaffOrgVo.setType("3"); }else{ - if(sysOrgRegister.getRegType().equals("0")){ - sysStaffOrgVo.setType("2"); - }else{ - sysStaffOrgVo.setType("3"); - } + sysStaffOrgVo.setType(sysOrgRegister.getRegType().toString()); } } String psid = sysOrganizationOne.getPsid(); @@ -511,6 +520,15 @@ public class SysUserRest { .eq("orgSid",dto.getOrgSid())); } SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + boolean a =sysOrgRegisters.contains(dto.getSourceSid()); + if(a){ + SysOrgRegister sysOrgRegister1=new SysOrgRegister(); + sysOrgRegister1.setOrgSid(dto.getOrgSid()); + sysOrgRegister1.setExpireDate(DateUtil.offsetDay(new Date(),15)); + sysOrgRegister1.setRegType(2); + sysOrgRegister1.setSourceSid(dto.getSourceSid()); + sysOrgRegisterService.save(sysOrgRegister1); + } for (SysOrgRegister sysOrgRegister : sysOrgRegisters) { //1>2 1 、1<2 -1 、1=2 0 int k= DateUtil.parse(sdf.format(DateUtil.parse(sdf.format(new Date())))).compareTo(DateUtil.parse(sdf.format(sysOrgRegister.getExpireDate()))); @@ -606,7 +624,8 @@ public class SysUserRest { } SysOrganization sysOrg=new SysOrganization(); sysOrg.setName(dto.getCompanyName()); - sysOrg.setLinkPhone(dto.getContacts()); + sysOrg.setLinkPerson(dto.getContacts()); + sysOrg.setLinkPhone(sysUser.getMobile()); sysOrg.setOrgSidPath(sysOrg.getSid()); sysOrg.setPsid("0"); sysOrganizationService.save(sysOrg); @@ -615,14 +634,14 @@ public class SysUserRest { sysUserService.update(sysUser,new QueryWrapper().eq("sid",sysUser.getSid())); List sysSources=sysSourceService.list(); List sysOrgRegisters=new ArrayList<>(); - for (SysSource sysSource : sysSources) { +// for (SysSource sysSource : sysSources) { SysOrgRegister sysOrgRegister=new SysOrgRegister(); sysOrgRegister.setOrgSid(sysOrg.getSid()); sysOrgRegister.setExpireDate(DateUtil.offsetDay(new Date(),15)); - sysOrgRegister.setRegType("2"); - sysOrgRegister.setSourceSid(sysSource.getSid()); + sysOrgRegister.setRegType(2); + sysOrgRegister.setSourceSid(dto.getSourceSid()); sysOrgRegisters.add(sysOrgRegister); - } +// } sysOrgRegisterService.saveBatch(sysOrgRegisters); SysStaffOrg sysStaffOrg=new SysStaffOrg(); sysStaffOrg.setStaffSid(sysUser.getStaffSid()); diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroup.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroup.java index 2efaa76..4b640d3 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroup.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroup.java @@ -16,12 +16,6 @@ public class SysAuthorizeGroup extends BaseEntity { @ApiModelProperty("权限组名") private String groupName; - - @ApiModelProperty("菜单sid") - private String menuSid; - - @ApiModelProperty("资源") - private String sourceSid; - + private String groupCode; } diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupDto.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupDto.java index 9697661..43ceb06 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupDto.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupDto.java @@ -2,60 +2,24 @@ package com.yxt.portal.biz.sysauthorizegroup; import com.yxt.common.core.dto.Dto; +import com.yxt.portal.biz.sysauthorizegroupdetail.SysAuthorizeGroupDetailDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.ArrayList; +import java.util.List; @ApiModel(value = "权限组表 数据传输对象", description = "权限组表 数据传输对象") @Data public class SysAuthorizeGroupDto implements Dto { - - private static final long serialVersionUID = -8143707488992909267L; - @ApiModelProperty(value = "菜单名称", required = true) - @NotBlank(message = "菜单名称不能为空") - private String name; - - @ApiModelProperty("菜单路由路径(VUE)") - private String menuUrl; - - @ApiModelProperty("菜单对应的前端页面路径") - private String pageUrl; - - @ApiModelProperty("菜单图标地址") - private String iconUrl; - - @ApiModelProperty(value = "资源sid", required = true) - @NotBlank(message = "资源不能为空") - private String sourceSid; - - @ApiModelProperty(value = "是否显示,默认为1显示，0为不显示", required = true) - @NotBlank(message = "是否显示不能为空") - private String isShow; - - @ApiModelProperty("排序号") - private Integer sortNo; - - @ApiModelProperty(value = "上级sid", example = "0", required = true) - @NotBlank(message = "上级菜单不能为空") - private String pSid; - - @ApiModelProperty(value = "前端页面路径重定向", required = false) - private Integer pageUrlRedirect; - - @ApiModelProperty("前端页面名称（vue组件名）") - private String pageName; - - @ApiModelProperty(value = "前端页面别名", required = false) - private String pageAliasName; - - @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") - private String menuType="0"; - - @ApiModelProperty(value = "备注") + private String sid; + private String groupName; + private String groupCode; + private List list =new ArrayList<>(); private String remarks; - private String cid; + } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.java index 567ce11..93c6e2a 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.java @@ -28,6 +28,8 @@ import java.util.List; @Mapper public interface SysAuthorizeGroupMapper extends BaseMapper { - + int deleteBySid(List list); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List listAll(); List getGroupByOrgSid(@Param("orgSid") String orgSid,@Param("sourceSid") String sourceSid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.xml b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.xml index 25f5609..9cd3c21 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.xml @@ -3,12 +3,35 @@ - + + + + update sys_authorize_group + set isDelete='1' + where sid in + + #{item} + + diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupQuery.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupQuery.java index fc8cb75..44cbbc3 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupQuery.java @@ -15,5 +15,7 @@ public class SysAuthorizeGroupQuery implements Query { @ApiModelProperty("资源sid") private String sourceSid; private String orgSid; + private String groupName; + private String groupCode; } diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupService.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupService.java index 1e74077..1429387 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupService.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupService.java @@ -1,23 +1,22 @@ package com.yxt.portal.biz.sysauthorizegroup; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.portal.biz.sysmenu.SysMenuTreeVo; -import com.yxt.portal.biz.sysroleauthorize.SysMenuRoleVo; -import com.yxt.portal.biz.syssource.SysSourceService; -import org.apache.commons.lang3.StringUtils; +import com.yxt.portal.biz.sysauthorizegroupdetail.SysAuthorizeGroupDetailVo; +import com.yxt.portal.utils.OrgPathQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; /** @@ -36,11 +35,85 @@ import java.util.stream.Collectors; @Service public class SysAuthorizeGroupService extends MybatisBaseService { + @Autowired + com.yxt.portal.biz.SysAuthorizeGroupDetaildetail.SysAuthorizeGroupDetailService sysAuthorizeGroupDetailService; + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + SysAuthorizeGroupQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getGroupName())){ + qw.like("a.groupName",query.getGroupName()); + } + qw.ne("a.isDelete","1"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + for (SysAuthorizeGroupVo record : records) { + List ws = sysAuthorizeGroupDetailService.getDetailByGroupSid(record.getSid()).getData(); + record.setList(ws); + } + return rb.success().setData(p); + } + public ResultBean> listAll( ) { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.listAll(); + return rb.success().setData(pagging); + } + public ResultBean saveOrUpdate(SysAuthorizeGroupDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + SysAuthorizeGroup wmsSysAuthorizeGroup = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsSysAuthorizeGroup, "id", "sid"); + wmsSysAuthorizeGroup.setModifyTime(new Date()); + sysAuthorizeGroupDetailService.saveOrUpdate(dto.getList()); + dto.getList().forEach(s->s.setGroupSid(dto.getSid())); + baseMapper.updateById(wmsSysAuthorizeGroup); + } else { + SysAuthorizeGroup wmsGoods = new SysAuthorizeGroup(); + sid = wmsGoods.getSid(); + BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); + wmsGoods.setCreateTime(new DateTime()); + dto.getList().forEach(s->s.setGroupSid(wmsGoods.getSid())); + sysAuthorizeGroupDetailService.saveOrUpdate(dto.getList()); + baseMapper.insert(wmsGoods); + } + return rb.success().setMsg("成功"); + } + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysAuthorizeGroupVo vo = new SysAuthorizeGroupVo(); + SysAuthorizeGroup wmsSysAuthorizeGroup = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != wmsSysAuthorizeGroup) { + BeanUtil.copyProperties(wmsSysAuthorizeGroup, vo); + } + List ws = sysAuthorizeGroupDetailService.getDetailByGroupSid(sid).getData(); + vo.setList(ws); + return rb.success().setData(vo); + } - public List getGroupByOrgSid(SysAuthorizeGroupQuery query) { + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysAuthorizeGroup wmsSysAuthorizeGroup = fetchBySid(sid); + if (null != wmsSysAuthorizeGroup) { + baseMapper.deleteById(wmsSysAuthorizeGroup.getId()); + } + return rb.success(); + } + public void delAll(String[] sids) { + int count = baseMapper.deleteBySid(Arrays.stream(sids).collect(Collectors.toList())); +// for (String sid : sids) { +// sysAuthorizeGroupDetailService.deleteByGroupSid(sid); +// } + } + public List getGroupByOrgSid(SysAuthorizeGroupQuery query) { return baseMapper.getGroupByOrgSid(query.getOrgSid(),query.getSourceSid()); } diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupVo.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupVo.java index 53bde8e..84e96f8 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupVo.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupVo.java @@ -2,10 +2,13 @@ package com.yxt.portal.biz.sysauthorizegroup; import com.yxt.common.core.vo.Vo; +import com.yxt.portal.biz.sysauthorizegroupdetail.SysAuthorizeGroupDetailDto; +import com.yxt.portal.biz.sysauthorizegroupdetail.SysAuthorizeGroupDetailVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -25,51 +28,10 @@ import java.util.List; @Data public class SysAuthorizeGroupVo implements Vo { - - @ApiModelProperty("菜单名称") - private String name; - - @ApiModelProperty("菜单路由路径(VUE)") - private String menuUrl; - - @ApiModelProperty("菜单对应的前端页面路径") - private String pageUrl; - - @ApiModelProperty("菜单图标地址") - private String iconUrl; - - @ApiModelProperty("资源sid") - private String sourceSid; - - @ApiModelProperty("是否显示,默认为1显示，0为不显示") - private String isShow; - - @ApiModelProperty("排序号") - private Integer sortNo; - - @ApiModelProperty("上级sid") - private String pSid; - @ApiModelProperty("上级名称") - private String pName; - @ApiModelProperty("sid") private String sid; + private String groupName; + private String groupCode; + private List list =new ArrayList<>(); + private String remarks; - @ApiModelProperty("前端页面路径重定向") - private Integer pageUrlRedirect; - - @ApiModelProperty("前端页面名称（vue组件名）") - private String pageName; - - @ApiModelProperty("前端页面别名") - private String pageAliasName; - - @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") - private String menuType; - @ApiModelProperty("子菜单") - private List children; - @ApiModelProperty("是否选中，1：未选中,0：选中") - private String checked; - @ApiModelProperty("资源名称") - private String sourceName; - private String cid; } diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetail.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetail.java index 0ccfa06..ad78c09 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetail.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetail.java @@ -13,9 +13,12 @@ import lombok.Data; public class SysAuthorizeGroupDetail extends BaseEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty("权限组名") - private String groupName; + + private String sid; + private String groupSid; + private String sourceSid; + private String menuSid; + private String children; diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailDto.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailDto.java index 73dd90e..001d33d 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailDto.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailDto.java @@ -13,49 +13,10 @@ import javax.validation.constraints.NotBlank; @Data public class SysAuthorizeGroupDetailDto implements Dto { - - private static final long serialVersionUID = -8143707488992909267L; - @ApiModelProperty(value = "菜单名称", required = true) - @NotBlank(message = "菜单名称不能为空") - private String name; - - @ApiModelProperty("菜单路由路径(VUE)") - private String menuUrl; - - @ApiModelProperty("菜单对应的前端页面路径") - private String pageUrl; - - @ApiModelProperty("菜单图标地址") - private String iconUrl; - - @ApiModelProperty(value = "资源sid", required = true) - @NotBlank(message = "资源不能为空") + private String sid; + private String groupSid; private String sourceSid; + private String menuSid; + private String children; - @ApiModelProperty(value = "是否显示,默认为1显示，0为不显示", required = true) - @NotBlank(message = "是否显示不能为空") - private String isShow; - - @ApiModelProperty("排序号") - private Integer sortNo; - - @ApiModelProperty(value = "上级sid", example = "0", required = true) - @NotBlank(message = "上级菜单不能为空") - private String pSid; - - @ApiModelProperty(value = "前端页面路径重定向", required = false) - private Integer pageUrlRedirect; - - @ApiModelProperty("前端页面名称（vue组件名）") - private String pageName; - - @ApiModelProperty(value = "前端页面别名", required = false) - private String pageAliasName; - - @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") - private String menuType="0"; - - @ApiModelProperty(value = "备注") - private String remarks; - private String cid; } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.java index 304ede5..26e5f36 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.java @@ -1,8 +1,14 @@ package com.yxt.portal.biz.sysauthorizegroupdetail; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.portal.biz.sysauthorizegroup.SysAuthorizeGroup; +import com.yxt.portal.biz.sysauthorizegroup.SysAuthorizeGroupVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -23,5 +29,11 @@ import java.util.List; public interface SysAuthorizeGroupDetailMapper extends BaseMapper { + int updateBySidIsDelete(List list); + int deleteByGroupSid(@Param("groupSid")String groupSid); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List listAll(@Param("orgPath")String orgPath); List getGroupByOrgSid(@Param("orgSid") String orgSid, @Param("sourceSid") String sourceSid); + @Select("select a.*,b.name as menuName from sys_authorize_group_detail a left join sys_menu b on b.sid=a.menuSid where a.groupSid=#{sid} and a.isDelete !='1' and a.isEnable='1'") + List getDetailByGroupSid(@Param("sid") String sid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.xml b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.xml index 8c2a0cf..541fe84 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.xml @@ -3,12 +3,40 @@ + + + + UPDATE sys_authorize_group_datail + SET isDelete=1 + where sid in + + #{item} + + + + delete from sys_authorize_group_datail + where groupSid =#{groupSid} + diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailService.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailService.java index 159caf7..5de311b 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailService.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailService.java @@ -1,9 +1,23 @@ -package com.yxt.portal.biz.sysauthorizegroupdetail; +package com.yxt.portal.biz.SysAuthorizeGroupDetaildetail; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.portal.biz.sysauthorizegroupdetail.*; +import com.yxt.portal.utils.OrgPathQuery; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * Project: anrui_portal(门户建设)
@@ -22,10 +36,76 @@ import java.util.List; public class SysAuthorizeGroupDetailService extends MybatisBaseService { + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + SysAuthorizeGroupDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.ne("a.isDelete","1"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + public ResultBean> listAll(OrgPathQuery query) { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.listAll(query.getOrgPath()); + return rb.success().setData(pagging); + } + + public ResultBean saveOrUpdate(List dtos) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if(dtos.size()!=0){ + baseMapper.delete(new QueryWrapper().eq("groupSid",dtos.get(0).getGroupSid())); + } + for (SysAuthorizeGroupDetailDto dto : dtos) { + SysAuthorizeGroupDetail wmsGoods = new SysAuthorizeGroupDetail(); + sid = wmsGoods.getSid(); + BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); + wmsGoods.setCreateTime(new DateTime()); + baseMapper.insert(wmsGoods); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysAuthorizeGroupDetailVo vo = new SysAuthorizeGroupDetailVo(); + SysAuthorizeGroupDetail wmsSysAuthorizeGroupDetail = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != wmsSysAuthorizeGroupDetail) { + BeanUtil.copyProperties(wmsSysAuthorizeGroupDetail, vo); +// if (StringUtils.isNotBlank(wmsGoods.getPicUrl())) { +// vo.setPicUrl(fileUploadComponent.getUrlPrefix() + wmsGoods.getPicUrl()); +// } +// vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); + } + return rb.success().setData(vo); + } + public ResultBean> getDetailByGroupSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List vo = baseMapper.getDetailByGroupSid(sid); + return rb.success().setData(vo); + } - public List getGroupByOrgSid(SysAuthorizeGroupDetailQuery query) { + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysAuthorizeGroupDetail wmsSysAuthorizeGroupDetail = fetchBySid(sid); + if (null != wmsSysAuthorizeGroupDetail) { + baseMapper.deleteById(wmsSysAuthorizeGroupDetail.getId()); + } + return rb.success(); + } + public void delAll(String[] sids) { + int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); + } + public void deleteByGroupSid(String groupSid) { + int count = baseMapper.deleteByGroupSid(groupSid); + } + public List getGroupByOrgSid(SysAuthorizeGroupDetailQuery query) { return baseMapper.getGroupByOrgSid(query.getOrgSid(),query.getSourceSid()); } diff --git a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailVo.java b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailVo.java index d0524f8..f7fde01 100644 --- a/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailVo.java +++ b/src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailVo.java @@ -25,51 +25,10 @@ import java.util.List; @Data public class SysAuthorizeGroupDetailVo implements Vo { - - @ApiModelProperty("菜单名称") - private String name; - - @ApiModelProperty("菜单路由路径(VUE)") - private String menuUrl; - - @ApiModelProperty("菜单对应的前端页面路径") - private String pageUrl; - - @ApiModelProperty("菜单图标地址") - private String iconUrl; - - @ApiModelProperty("资源sid") + private String groupSid; private String sourceSid; - - @ApiModelProperty("是否显示,默认为1显示，0为不显示") - private String isShow; - - @ApiModelProperty("排序号") - private Integer sortNo; - - @ApiModelProperty("上级sid") - private String pSid; - @ApiModelProperty("上级名称") - private String pName; - @ApiModelProperty("sid") - private String sid; + private String menuSid; + private String menuName; + private String children; - @ApiModelProperty("前端页面路径重定向") - private Integer pageUrlRedirect; - - @ApiModelProperty("前端页面名称（vue组件名）") - private String pageName; - - @ApiModelProperty("前端页面别名") - private String pageAliasName; - - @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") - private String menuType; - @ApiModelProperty("子菜单") - private List children; - @ApiModelProperty("是否选中，1：未选中,0：选中") - private String checked; - @ApiModelProperty("资源名称") - private String sourceName; - private String cid; } diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml index 7510a7a..719b9ad 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml @@ -21,9 +21,11 @@ diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java index 1154d7d..1a78123 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java @@ -435,14 +435,14 @@ public class SysMenuService extends MybatisBaseService { SysMenu entity = new SysMenu(); dto.fillEntity(entity); save(entity); - String[] strings={"001","002"}; - for (String string : strings) { - SysRoleAuthorize sysRoleAuthorize=new SysRoleAuthorize(); - sysRoleAuthorize.setRoleSid(string); - sysRoleAuthorize.setMenuSid(entity.getSid()); - sysRoleAuthorize.setSourceSid(dto.getSourceSid()); - sysRoleAuthorizeService.save(sysRoleAuthorize); - } +// String[] strings={"001","002"}; +// for (String string : strings) { +// SysRoleAuthorize sysRoleAuthorize=new SysRoleAuthorize(); +// sysRoleAuthorize.setRoleSid(string); +// sysRoleAuthorize.setMenuSid(entity.getSid()); +// sysRoleAuthorize.setSourceSid(dto.getSourceSid()); +// sysRoleAuthorizeService.save(sysRoleAuthorize); +// } } public List selectByMenuUrl(String menuUrl) { diff --git a/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java index e2ec9df..584a7b8 100644 --- a/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java @@ -36,6 +36,7 @@ public interface SysOrganizationMapper extends BaseMapper { List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); List selectFirstOrgList(@Param("orgSid")String orgSid); + List selectFirstOrgList1(@Param("orgSid")String orgSid); List selectChildrenListByPsid(@Param("psid") String psid); diff --git a/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml index c6c31f1..f0455cc 100644 --- a/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -41,6 +41,14 @@ and sid=#{orgSid} + + select DISTINCT a.name as orgName,a.linkPerson,a.linkPhone ,a.sid as orgSid, + ( + SELECT + GROUP_CONCAT( e.groupName ) + FROM + sys_org_authorize d + LEFT JOIN sys_authorize_group e ON e.sid = d.authorizeGroupSid + WHERE + d.orgSid = a.sid + ) AS authorizeGroupName + FROM + sys_organization a + left join sys_org_authorize b on b.orgSid=a.sid + + ${ew.sqlSegment} + + GROUP BY + a.sid + + + + + delete from sys_authorize_group + where sid in + + #{item} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeQuery.java b/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeQuery.java index 73232f7..35ecfde 100644 --- a/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeQuery.java @@ -36,6 +36,7 @@ public class SysOrgAuthorizeQuery implements Query { private String sourceSid; @ApiModelProperty("是否是系统管理员") private String isAdmin; - + private String orgName; + private String linkPerson; } diff --git a/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeService.java b/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeService.java index 8be025a..88c3626 100644 --- a/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeService.java +++ b/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeService.java @@ -1,22 +1,22 @@ package com.yxt.portal.biz.sysorgauthorize; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.portal.biz.sysmenu.SysMenuService; -import com.yxt.portal.biz.sysrole.SysRole; -import com.yxt.portal.biz.sysrole.SysRoleService; -import com.yxt.portal.biz.sysroleauthorize.SysMenuRoleVo; -import com.yxt.portal.biz.sysroleauthorize.SysRoleAuthorize; -import com.yxt.portal.biz.sysroleauthorize.SysRoleAuthorizeVo; -import org.apache.commons.lang3.StringUtils; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.portal.biz.syssource.SysSourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; /** * Project: anrui_portal(门户建设)
@@ -33,67 +33,94 @@ import java.util.Objects; */ @Service public class SysOrgAuthorizeService extends MybatisBaseService { - @Autowired - SysMenuService sysMenuService; - @Autowired - SysRoleService sysRoleService; - /** - * 解析和组装查询条件，封装在qw中 - * - * @param query - * @return - */ - private QueryWrapper buildQueryWrapper(SysOrgAuthorizeQuery query) { - QueryWrapper qw = new QueryWrapper<>(); - if (query != null) { - if (StringUtils.isNotBlank(query.getSourceSid())) { - qw.eq("m.sourceSid", query.getSourceSid()); - } - /*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) { - qw.in("rm.roleSid", query.getRoleSid()); - }*/ - if (StringUtils.isNotBlank(query.getIsAdmin())) { - if (!query.getIsAdmin().equals("1")){ - qw.eq("m.isEnable", 1); - } + @Autowired + SysSourceService sysSourceService; + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + SysOrgAuthorizeQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getOrgName())){ + qw.like("a.name",query.getOrgName()); + } + if(StringUtils.isNotBlank(query.getLinkPerson())){ + qw.like("a.linkPerson",query.getLinkPerson()); + } + qw.ne("a.isDelete","1"); + qw.eq("psid","0"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + for (SysOrgAuthorizeVo record : p.getRecords()) { + List sids=new ArrayList<>(); + List sysOrgAuthorize=baseMapper.selectList(new QueryWrapper().eq("orgSid",record.getOrgSid())); + for (SysOrgAuthorize orgAuthorize : sysOrgAuthorize) { + sids.add(orgAuthorize.getAuthorizeGroupSid()); + record.setGroupSids(sids); } - if (query.getRoleSids() != null && query.getRoleSids().size() > 0) { - qw.in("rm.roleSid", query.getRoleSids()); - } - qw.eq("m.isShow", 1); - qw.orderByAsc("m.sortNo"); } + return rb.success().setData(p); + } + public ResultBean> listAll( ) { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.listAll(); + return rb.success().setData(pagging); + } - return qw; + public ResultBean saveOrUpdate(SysOrgAuthorizeDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + baseMapper.delete(new QueryWrapper().eq("orgSid",dto.getOrgSid())); +// if (com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getSid())) { +// sid = dto.getSid(); +// SysOrgAuthorize wmsSysOrgAuthorize = fetchBySid(dto.getSid()); +// BeanUtil.copyProperties(dto, wmsSysOrgAuthorize, "id", "sid"); +// wmsSysOrgAuthorize.setModifyTime(new Date()); +// baseMapper.updateById(wmsSysOrgAuthorize); +// } else { + for (String groupSid : dto.getGroupSids()) { + SysOrgAuthorize wmsGoods = new SysOrgAuthorize(); + wmsGoods.setOrgSid(dto.getOrgSid()); + wmsGoods.setAuthorizeGroupSid(groupSid); + wmsGoods.setCreateTime(new DateTime()); + baseMapper.insert(wmsGoods); + } +// } + return rb.success().setMsg("成功"); } - public List list(SysOrgAuthorizeQuery query) { - // mybits所用的查询条件封装类 - QueryWrapper qw = buildQueryWrapper(query); - return baseMapper.list(qw); + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysOrgAuthorizeVo vo = new SysOrgAuthorizeVo(); + SysOrgAuthorize wmsSysOrgAuthorize = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != wmsSysOrgAuthorize) { + BeanUtil.copyProperties(wmsSysOrgAuthorize, vo); + } + return rb.success().setData(vo); } - /** - * 资源菜单树形列表 - * - * @param query:roleSids,sourceSid - * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单） - */ - public List> getSourceMenuTreeOfRoles(SysOrgAuthorizeQuery query, Map map_rolemenus) { - //获取当前资源的菜单列表 - List> list_menus_map = new ArrayList>(); - if (null == query) - return list_menus_map; - //角色s的某个资源的所有菜单列表 - List list_menu = list(query); - list_menus_map = sysMenuService.getSourceMenuTree(list_menu, map_rolemenus); - return list_menus_map; + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysOrgAuthorize wmsSysOrgAuthorize = fetchBySid(sid); + if (null != wmsSysOrgAuthorize) { + baseMapper.deleteById(wmsSysOrgAuthorize.getId()); + } + return rb.success(); + } + public void delAll(String[] sids) { + int count = baseMapper.deleteBySid(Arrays.stream(sids).collect(Collectors.toList())); + } + public ResultBean> getRegistrationInformation(String sid) { + ResultBean rb = ResultBean.fireFail(); + List vo2s= baseMapper.getRegistrationInformation(sid); + return rb.success().setData(vo2s); } diff --git a/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo.java b/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo.java index 89dc0fa..2418bc1 100644 --- a/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo.java @@ -5,6 +5,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import lombok.Data; +import java.util.List; + /** * Project: anrui_portal(门户建设)
* File: SysSourceVo.java
@@ -26,5 +28,12 @@ public class SysOrgAuthorizeVo implements Vo { private String orgSid;//组织 private String sourceSid;//资源sid private String menuSid;//菜单sid - private String funcSid;//功能sid + private String funSid;//功能sid + private String authorizeGroupSid;//权限组 + private String authorizeGroupName;//权限组 + private String orgName;//权限组 + private String linkPerson;//权限组 + private String linkPhone;//权限组 + private List groupSids;//权限组 + } diff --git a/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo2.java b/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo2.java new file mode 100644 index 0000000..f8be426 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo2.java @@ -0,0 +1,18 @@ +package com.yxt.portal.biz.sysorgauthorize; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/10/15 15:36 + */ +@Data +public class SysOrgAuthorizeVo2 { + private String sourceName; + private String sourceSid; + private String createTime; + private String expireDate; + private Integer regType; + private String orgSid; + +} diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegister.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegister.java index 49d7310..a7f95d0 100644 --- a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegister.java +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegister.java @@ -25,7 +25,7 @@ public class SysOrgRegister extends BaseEntity { @ApiModelProperty("时间") private Date expireDate; @ApiModelProperty("1 体验 2 正式 3过期") - private String regType; + private Integer regType; } diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterDto.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterDto.java index 23d49d3..855dd88 100644 --- a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterDto.java +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterDto.java @@ -23,6 +23,6 @@ public class SysOrgRegisterDto implements Dto { @ApiModelProperty("时间") private String expireDate; - @ApiModelProperty("1 体验 2 正式 3过期") - private String regType; + @ApiModelProperty("1 体验 2 正式 ") + private Integer regType; } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterService.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterService.java index 4641e5b..758087a 100644 --- a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterService.java +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterService.java @@ -1,6 +1,11 @@ package com.yxt.portal.biz.sysorgregister; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; import com.yxt.portal.biz.sysmenu.SysMenuTreeVo; import org.springframework.stereotype.Service; @@ -23,7 +28,19 @@ import java.util.List; public class SysOrgRegisterService extends MybatisBaseService { - + public ResultBean saveOrUpdate(List dtos) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.delete(new QueryWrapper().eq("orgSid", dtos.get(0).getOrgSid())); + for (SysOrgRegisterDto dto : dtos) { + SysOrgRegister sysOrgRegister = new SysOrgRegister(); + sysOrgRegister.setOrgSid(dto.getOrgSid()); + sysOrgRegister.setSourceSid(dto.getSourceSid()); + sysOrgRegister.setExpireDate(DateUtil.parse(dto.getExpireDate())); + sysOrgRegister.setRegType(dto.getRegType()); + baseMapper.insert(sysOrgRegister); + } + return rb.success().setMsg("成功"); + } public List listMenuTreeVo(String sourceSid) { return baseMapper.listMenuTreeVo(sourceSid); diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterVo.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterVo.java index af77b69..89caa0c 100644 --- a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterVo.java @@ -35,5 +35,5 @@ public class SysOrgRegisterVo implements Vo { @ApiModelProperty("时间") private String expireDate; @ApiModelProperty("1 体验 2 正式 3过期") - private String regType; + private Integer regType; } diff --git a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml index 385c7c0..4a9da40 100644 --- a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml @@ -17,9 +17,11 @@ '本人数据' END AS dataRuleValue, - sr.orgSid + sr.orgSid, + o.name as orgName FROM sys_role sr LEFT JOIN sys_post sp ON sr.postSid = sp.sid + left join sys_organization o on o.sid =sr.orgSid ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java index fc8b47b..d1b6f17 100644 --- a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java @@ -47,4 +47,6 @@ public class SysRoleVo implements Vo { private String dataRuleId; private String dataRuleValue; private String orgSid; + private String orgName; + private String sourceSid; } diff --git a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java index 6da2e8c..af391e1 100644 --- a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java @@ -29,6 +29,6 @@ public interface SysRoleAuthorizeMapper extends BaseMapper { List list(@Param(Constants.WRAPPER) QueryWrapper qw); List selectByRoleSid(String roleSid); - @Delete("delete from sys_role_authorize where roleSid=#{roleSid} and sourceSid =#{sourceSid}") void delByRoleSid(@Param("roleSid") String roleSid,@Param("sourceSid") String sourceSid); + } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.xml b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.xml index c69608f..b4c77bc 100644 --- a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.xml @@ -30,4 +30,12 @@ from sys_role_authorize where roleSid = #{roleSid} + + delete from sys_role_authorize + where + roleSid=#{roleSid} + + and sourceSid =#{sourceSid} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java index 41d2305..91eddc5 100644 --- a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java +++ b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java @@ -128,6 +128,40 @@ public class SysRoleAuthorizeService extends MybatisBaseService dtos) { + + ResultBean rb = ResultBean.fireFail(); + delByRoleSid(dtos.get(0).getRoleSid(),""); + for (SysRoleAuthorizeDto dto : dtos) { + String roleSid=dto.getRoleSid(); + String menuSid=dto.getMenuSid(); + if(com.yxt.common.base.utils.StringUtils.isBlank(roleSid)){ + return ResultBean.fireFail().setMessage("角色sid不能为空"); + }else{ + SysRole sysRole = sysRoleService.fetchBySid(roleSid); + if(sysRole==null|| com.yxt.common.base.utils.StringUtils.isBlank(sysRole.getSid())){ + return ResultBean.fireFail().setMessage("角色sid不存在"); + } + } + List menuRoleList = selectByRoleSid(roleSid); + + if(!com.yxt.common.base.utils.StringUtils.isBlank(menuSid)){ + String[] sids = menuSid.split(","); + for(String sid:sids){ + SysRoleAuthorizeVo menuRoleVo = menuRoleList.stream().filter(s -> Objects.equals(s.getMenuSid(), sid)).findFirst().orElse(null); + SysRoleAuthorize sysMenuRole = new SysRoleAuthorize(); + sysMenuRole.setRoleSid(roleSid); + sysMenuRole.setMenuSid(sid); + sysMenuRole.setSourceSid(dto.getSourceSid()); + if(menuRoleVo != null){ + sysMenuRole.setDataRuleId(menuRoleVo.getDataRuleId()); + } + save(sysMenuRole); + } + } + } + return rb.success(); + } public List selectByRoleSid(String roleSid) { return baseMapper.selectByRoleSid(roleSid); } diff --git a/src/main/java/com/yxt/portal/biz/syssource/SysSourceDto.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceDto.java index 7cc501d..98c95ea 100644 --- a/src/main/java/com/yxt/portal/biz/syssource/SysSourceDto.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceDto.java @@ -23,7 +23,8 @@ import lombok.Data; @Data public class SysSourceDto implements Dto { - + private String id; + private String sid; @ApiModelProperty("父资源sid") private String pSid; diff --git a/src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java index 0871e4f..4b23476 100644 --- a/src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java @@ -62,7 +62,7 @@ public class SysSourceService extends MybatisBaseService { //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew, @Param("orgName") String orgName, @Param("userName") String userName,@Param("orgSid") String orgSid); + IPage selectPageVoAdmin(IPage page, @Param(Constants.WRAPPER) Wrapper ew, @Param("orgName") String orgName, @Param("userName") String userName); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); diff --git a/src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml b/src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml index 8717403..9478286 100644 --- a/src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml @@ -118,6 +118,121 @@ +