增加外部用户（可用户渠道商，供应商，客户等场景）登陆

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");

vboot-core/src/main/java/vboot/core/module/sys/coop/cate/SysCoopCateService.java

@@ -22,7 +22,7 @@ public class SysCoopCateService extends BaseCateService<SysCoopCate> {
     }
 
     public String updatex(SysCoopCate cate){
-        updatex(cate);
+        update(cate);
         SysOrg sysOrg=new SysOrg(cate.getId(),cate.getName(),64);
         orgRepo.save(sysOrg);
         return cate.getId();

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));

vboot-core/src/main/java/vboot/core/module/sys/coop/corp/SysCoopCorpService.java

@@ -24,7 +24,7 @@ public class SysCoopCorpService extends BaseMainService<SysCoopCorp> {
     }
 
     public String updatex(SysCoopCorp corp){
-        updatex(corp);
+        update(corp);
         SysOrg sysOrg=new SysOrg(corp.getId(),corp.getName(),128);
         orgRepo.save(sysOrg);
         return corp.getId();

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;
 
+
+
 }

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);
     }
 

vboot-core/src/main/java/vboot/core/module/sys/coop/user/SysCoopUserService.java

@@ -22,7 +22,7 @@ public class SysCoopUserService extends BaseMainService<SysCoopUser> {
     }
 
     public String updatex(SysCoopUser user){
-        updatex(user);
+        update(user);
         SysOrg sysOrg=new SysOrg(user.getId(),user.getName(),256);
         orgRepo.save(sysOrg);
         return user.getId();

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<String> menuSet = new HashSet<>();
         for (String id : ids) {
             menuSet.add(id);

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");