From 3b1f62eed74fb08e271f28af18ae8784315e63d2 Mon Sep 17 00:00:00 2001 From: zsvg <8680782@qq.com> Date: Thu, 20 Oct 2022 09:28:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=96=E9=83=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=EF=BC=88=E5=8F=AF=E7=94=A8=E6=88=B7=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E5=95=86=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=EF=BC=8C=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AD=89=E5=9C=BA=E6=99=AF=EF=BC=89=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/module/sys/api/role/SysApiRoleApi.java | 4 +++- .../module/sys/coop/cate/SysCoopCateService.java | 2 +- .../core/module/sys/coop/corp/SysCoopCorpApi.java | 1 + .../module/sys/coop/corp/SysCoopCorpService.java | 2 +- .../core/module/sys/coop/user/SysCoopUser.java | 14 +++++++++++--- .../core/module/sys/coop/user/SysCoopUserApi.java | 2 ++ .../module/sys/coop/user/SysCoopUserService.java | 2 +- .../sys/portal/menu/SysPortalMenuService.java | 3 +++ .../module/sys/portal/role/SysPortalRoleApi.java | 4 +++- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/vboot-core/src/main/java/vboot/core/module/sys/api/role/SysApiRoleApi.java b/vboot-core/src/main/java/vboot/core/module/sys/api/role/SysApiRoleApi.java index 14ffbff..d5b8b39 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/api/role/SysApiRoleApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/api/role/SysApiRoleApi.java @@ -17,8 +17,10 @@ public class SysApiRoleApi { @GetMapping @ApiOperation("查询接口角色分页") public R get(String id, String name) { - Sqler sqler = new Sqler("t.id,t.crtim,t.name", table); + Sqler sqler = new Sqler("t.id,t.name", table); sqler.addLeftJoin("o.name as crman", "sys_org o", "o.id=t.crman"); + sqler.addLeftJoin("o2.name as upman", "sys_org o2", "o2.id=t.upman"); + sqler.addSelect("t.crtim,t.uptim,t.notes"); sqler.addLike("t.name", name); sqler.addLike("t.id", id); sqler.addOrder("t.crtim desc"); diff --git a/vboot-core/src/main/java/vboot/core/module/sys/coop/cate/SysCoopCateService.java b/vboot-core/src/main/java/vboot/core/module/sys/coop/cate/SysCoopCateService.java index ea8cd61..e1a20ed 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/coop/cate/SysCoopCateService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/coop/cate/SysCoopCateService.java @@ -22,7 +22,7 @@ public class SysCoopCateService extends BaseCateService { } public String updatex(SysCoopCate cate){ - updatex(cate); + update(cate); SysOrg sysOrg=new SysOrg(cate.getId(),cate.getName(),64); orgRepo.save(sysOrg); return cate.getId(); diff --git a/vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpApi.java b/vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpApi.java index 92e522e..723e776 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpApi.java @@ -21,6 +21,7 @@ public class SysCoopCorpApi { Sqler sqler = new Sqler("sys_coop_corp"); sqler.addLike("t.name" , name); sqler.addEqual("t.catid" , catid); + sqler.addLeftJoin("c.name catna","sys_coop_cate c" , "c.id=t.catid"); sqler.addOrder("t.ornum"); sqler.addSelect("t.notes"); return R.ok(service.findPageData(sqler)); diff --git a/vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpService.java b/vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpService.java index 999808b..dd44c21 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpService.java @@ -24,7 +24,7 @@ public class SysCoopCorpService extends BaseMainService { } public String updatex(SysCoopCorp corp){ - updatex(corp); + update(corp); SysOrg sysOrg=new SysOrg(corp.getId(),corp.getName(),128); orgRepo.save(sysOrg); return corp.getId(); diff --git a/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUser.java b/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUser.java index 21265a5..8900cae 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUser.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUser.java @@ -5,9 +5,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import vboot.core.common.mvc.entity.BaseMainEntity; +import vboot.core.module.sys.coop.corp.SysCoopCorp; +import vboot.core.module.sys.org.root.SysOrg; -import javax.persistence.Column; -import javax.persistence.Entity; +import javax.persistence.*; @Entity @Getter @@ -18,10 +19,15 @@ public class SysCoopUser extends BaseMainEntity { @ApiModelProperty("主账号标记")// 1启用，0禁用 protected Boolean prtag = true; - @Column(length = 32) + @Transient @ApiModelProperty("公司ID") private String corid; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "corid") + @ApiModelProperty("外部公司") + private SysCoopCorp corp; + @ApiModelProperty("排序号") private Integer ornum; @@ -58,4 +64,6 @@ public class SysCoopUser extends BaseMainEntity { @ApiModelProperty("层级") private String tier; + + } \ No newline at end of file diff --git a/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserApi.java b/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserApi.java index 60fdc61..eb09bdb 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserApi.java @@ -19,6 +19,7 @@ public class SysCoopUserApi { Sqler sqler = new Sqler("sys_coop_user"); sqler.addLike("t.name" , name); sqler.addEqual("t.corid" , corid); + sqler.addLeftJoin("c.name corna","sys_coop_corp c" , "c.id=t.corid"); sqler.addOrder("t.ornum"); sqler.addSelect("t.notes"); return R.ok(service.findPageData(sqler)); @@ -35,6 +36,7 @@ public class SysCoopUserApi { @ApiOperation("查询详情") public R getOne(@PathVariable String id) { SysCoopUser main = service.findOne(id); + return R.ok(main); } diff --git a/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserService.java b/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserService.java index 25b58d4..19bceb5 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserService.java @@ -22,7 +22,7 @@ public class SysCoopUserService extends BaseMainService { } public String updatex(SysCoopUser user){ - updatex(user); + update(user); SysOrg sysOrg=new SysOrg(user.getId(),user.getName(),256); orgRepo.save(sysOrg); return user.getId(); diff --git a/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuService.java b/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuService.java index 766bf1e..af70cf6 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuService.java @@ -23,6 +23,7 @@ public class SysPortalMenuService { } public String insert(SysPortalMenu main) { + jdbcDao.update("update sys_org_user set retag = 0"); if (main.getId() == null || "".equals(main.getId())) { main.setId(XstrUtil.getUUID()); } @@ -32,10 +33,12 @@ public class SysPortalMenuService { public SysPortalMenu update(SysPortalMenu main) { + jdbcDao.update("update sys_org_user set retag = 0"); return repo.save(main); } public int delete(String[] ids) { + jdbcDao.update("update sys_org_user set retag = 0"); Set menuSet = new HashSet<>(); for (String id : ids) { menuSet.add(id); diff --git a/vboot-core/src/main/java/vboot/core/module/sys/portal/role/SysPortalRoleApi.java b/vboot-core/src/main/java/vboot/core/module/sys/portal/role/SysPortalRoleApi.java index bcf8cbc..6a43a28 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/portal/role/SysPortalRoleApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/portal/role/SysPortalRoleApi.java @@ -17,8 +17,10 @@ public class SysPortalRoleApi { @GetMapping @ApiOperation("查询门户角色分页") public R get(String id, String name) { - Sqler sqler = new Sqler("t.id,t.crtim,t.name", table); + Sqler sqler = new Sqler("t.id,t.name", table); sqler.addLeftJoin("o.name as crman", "sys_org o", "o.id=t.crman"); + sqler.addLeftJoin("o2.name as upman", "sys_org o2", "o2.id=t.upman"); + sqler.addSelect("t.crtim,t.uptim,t.notes"); sqler.addLike("t.name", name); sqler.addLike("t.id", id); sqler.addOrder("t.crtim desc");