11

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<PagerVo<SysAuthorizeGroupVo>> listPage(@RequestBody PagerQuery<SysAuthorizeGroupQuery> pq) {
+        return sysAuthorizeGroupService.listPage(pq);
+    }
+    @ApiOperation("查询所有的类别")
+    @GetMapping("/listAll")
+    public ResultBean<List<SysAuthorizeGroup>> listAll() {
+        return sysAuthorizeGroupService.listAll();
+    }
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean<String> saveOrUpdate(@RequestBody SysAuthorizeGroupDto dto) {
+        return sysAuthorizeGroupService.saveOrUpdate(dto);
+    }
+
+    @ApiOperation("初始化")
+    @GetMapping("/initialization/{sid}")
+    public ResultBean<SysAuthorizeGroupVo> 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();
+    }
 }

src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java

@@ -189,8 +189,12 @@ public class SysMenuRest {
         String a="";
         List<SysUserRoleVo> 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(), "","");

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<PagerVo<SysOrgAuthorizeVo>> listPage(@RequestBody PagerQuery<SysOrgAuthorizeQuery> pq) {
+        return sysOrgAuthorizeService.listPage(pq);
+    }
+    @ApiOperation("查询所有的类别")
+    @GetMapping("/listAll")
+    public ResultBean<List<SysOrgAuthorize>> listAll() {
+        return sysOrgAuthorizeService.listAll();
+    }
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean<String> saveOrUpdate(@RequestBody SysOrgAuthorizeDto dto) {
+        return sysOrgAuthorizeService.saveOrUpdate(dto);
+    }
+
+    @ApiOperation("初始化")
+    @GetMapping("/initialization/{sid}")
+    public ResultBean<SysOrgAuthorizeVo> 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);
+    }
 }

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<String> saveOrUpdate(@RequestBody List<SysOrgRegisterDto> dtos) {
+        return sysOrgRegisterService.saveOrUpdate(dtos);
+    }
 }

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<SysRoleAuthorizeDto> dtos){
+        return sysRoleAuthorizeService.updateRoleAndMenuAdmin(dtos);
+    }
+
 }

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<List<SysRoleVo>> listAll(@RequestBody SysRoleQuery query){

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<PagerVo<SysSourceVo>> listPage(@RequestBody PagerQuery<SysSourceQuery> 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<SysSourceVo> pv = sysSourceService.listPageVo(pq);
 		return rb.success().setData(pv);
 	}
 
-
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
 	public ResultBean<List<SysSourceVo>> listAll(@RequestBody SysSourceQuery query){
 		ResultBean rb = ResultBean.fireFail();
 		List<SysSourceVo> list = sysSourceService.listAllVo(query);
 		return rb.success().setData(list);
 	}
 
-
+	@ApiOperation("根据角色sid条件查询所有数据列表")
+	@PostMapping("/listAllByRoleSid")
 	public ResultBean<List<SysSourceVo>> listAllByRoleSid(SysSourceQuery query) {
 		ResultBean rb = ResultBean.fireFail();
 		List<SysSourceVo> list = sysSourceService.listAllByRoleSid(query);
 		return rb.success().setData(list);
 	}
 
-
+	@ApiOperation("所有数据列表")
+	@GetMapping("/list")
 	public ResultBean<List<SysSourceVo>> list(){
 		ResultBean rb = ResultBean.fireFail();
 		List<SysSourceVo> 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<SysSourceVo> fetch(String id){
 		ResultBean rb = ResultBean.fireFail();
 		SysSourceVo vo = sysSourceService.fetchByIdVo(id);
 		return rb.success().setData(vo);
 	}
 
-
+	@ApiOperation("获取一条记录 根据sid")
+	@GetMapping("/fetchBySid/{sid}")
 	public ResultBean<SysSourceVo> fetchBySid(String sid) {
 		ResultBean rb = ResultBean.fireFail();
 		SysSourceVo vo = sysSourceService.fetchBySidVo(sid);

src/main/java/com/yxt/portal/apiadmin/SysUserRest.java

@@ -107,6 +107,13 @@ public class SysUserRest {
         PagerVo<SysUserVo> pv = sysUserService.listPageVo(pq);
         return rb.success().setData(pv);
     }
+    @ApiOperation("根据条件分页查询数据的列表 ")
+    @PostMapping("/listPageVoAdmin")
+    public ResultBean<PagerVo<SysUserVo>> listPageVoAdmin(@RequestBody PagerQuery<SysUserQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();//roleSid
+        PagerVo<SysUserVo> 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<SysUserVo>().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<SysUserVo>().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<SysUser>().eq("sid",sysUser.getSid()));
         List<SysSource> sysSources=sysSourceService.list();
         List<SysOrgRegister> 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());

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

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<SysAuthorizeGroupDetailDto> list =new ArrayList<>();
     private String remarks;
-    private String cid;
+
 }

src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.java

@@ -28,6 +28,8 @@ import java.util.List;
 @Mapper
 public interface SysAuthorizeGroupMapper extends BaseMapper<SysAuthorizeGroup> {
 
-
+	int deleteBySid(List<String> list);
+	IPage<SysAuthorizeGroupVo> listPage(IPage<SysAuthorizeGroup> page, @Param(Constants.WRAPPER) QueryWrapper<SysAuthorizeGroup> qw);
+	List<SysAuthorizeGroupVo> listAll();
 	List<SysAuthorizeGroupVo> getGroupByOrgSid(@Param("orgSid") String orgSid,@Param("sourceSid") String sourceSid);
 }

src/main/java/com/yxt/portal/biz/sysauthorizegroup/SysAuthorizeGroupMapper.xml

@@ -3,12 +3,35 @@
 <mapper namespace="com.yxt.portal.biz.sysauthorizegroup.SysAuthorizeGroupMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-
+    <select id="listPage" resultType="com.yxt.portal.biz.sysauthorizegroup.SysAuthorizeGroupVo">
+        select
+        *
+        from sys_authorize_group a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="listAll" resultType="com.yxt.portal.biz.sysauthorizegroup.SysAuthorizeGroupVo">
+        select
+        *
+        from sys_authorize_group a
+        <where>
+              a.isDelete !='1' and a.isEnable='1'
+        </where>
+    </select>
+    <update id="deleteBySid">
+        update  sys_authorize_group
+        set isDelete='1'
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
     <!--将该资源下的所有一级菜单列表-->
     <select id="getGroupByOrgSid"  resultType="com.yxt.portal.biz.sysmenu.SysMenuTreeVo">
         SELECT *
         FROM sys_authorize_group gr
-        LEFT JOIN sys_org_authorize au ON gr.sid = au.ahthorizeGroupSid
+        LEFT JOIN sys_org_authorize au ON gr.sid = au.authorizeGroupSid
         WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1
         ORDER BY menu.sortNo ASC
     </select>

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

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<SysAuthorizeGroupMapper, SysAuthorizeGroup> {
 
+    @Autowired
+    com.yxt.portal.biz.SysAuthorizeGroupDetaildetail.SysAuthorizeGroupDetailService sysAuthorizeGroupDetailService;
+    public ResultBean<PagerVo<SysAuthorizeGroupVo>> listPage(PagerQuery<SysAuthorizeGroupQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        SysAuthorizeGroupQuery query = pq.getParams();
+        QueryWrapper<SysAuthorizeGroup> qw = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(query.getGroupName())){
+            qw.like("a.groupName",query.getGroupName());
+        }
+        qw.ne("a.isDelete","1");
+        IPage<SysAuthorizeGroup> page = PagerUtil.queryToPage(pq);
+        IPage<SysAuthorizeGroupVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<SysAuthorizeGroupVo> p = PagerUtil.pageToVo(pagging, null);
+        List<SysAuthorizeGroupVo> records = pagging.getRecords();
+        for (SysAuthorizeGroupVo record : records) {
+            List<SysAuthorizeGroupDetailVo> ws = sysAuthorizeGroupDetailService.getDetailByGroupSid(record.getSid()).getData();
+            record.setList(ws);
+        }
+        return rb.success().setData(p);
+    }
+    public ResultBean<List<SysAuthorizeGroup>> listAll( ) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysAuthorizeGroupVo> pagging = baseMapper.listAll();
+        return rb.success().setData(pagging);
+    }
 
+    public ResultBean<String> 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<SysAuthorizeGroupVo> 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<SysAuthorizeGroupDetailVo> ws = sysAuthorizeGroupDetailService.getDetailByGroupSid(sid).getData();
+        vo.setList(ws);
+        return rb.success().setData(vo);
+    }
 
-    public List<SysAuthorizeGroupVo> 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<SysAuthorizeGroupVo> getGroupByOrgSid(SysAuthorizeGroupQuery query) {
         return baseMapper.getGroupByOrgSid(query.getOrgSid(),query.getSourceSid());
     }
 

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<SysAuthorizeGroupDetailVo> 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<SysAuthorizeGroupVo> children;
-    @ApiModelProperty("是否选中，1：未选中,0：选中")
-    private String checked;
-    @ApiModelProperty("资源名称")
-    private String sourceName;
-    private String cid;
 }

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;
 
     
 

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

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<SysAuthorizeGroupDetail> {
 
 
+	int updateBySidIsDelete(List<String> list);
+	int deleteByGroupSid(@Param("groupSid")String groupSid);
+	IPage<SysAuthorizeGroupDetailVo> listPage(IPage<SysAuthorizeGroupDetail> page, @Param(Constants.WRAPPER) QueryWrapper<SysAuthorizeGroupDetail> qw);
+	List<SysAuthorizeGroupDetailVo> listAll(@Param("orgPath")String orgPath);
 	List<SysAuthorizeGroupDetailVo> 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<SysAuthorizeGroupDetailVo> getDetailByGroupSid(@Param("sid") String sid);
 }

src/main/java/com/yxt/portal/biz/sysauthorizegroupdetail/SysAuthorizeGroupDetailMapper.xml

@@ -3,12 +3,40 @@
 <mapper namespace="com.yxt.portal.biz.sysauthorizegroupdetail.SysAuthorizeGroupDetailMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
+    <select id="listPage" resultType="com.yxt.portal.biz.sysauthorizegroup.SysAuthorizeGroupVo">
+        select
+        *
+        from sys_authorize_group_datail a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="listAll" resultType="com.yxt.portal.biz.sysauthorizegroup.SysAuthorizeGroupVo">
+        select
+        *
+        from sys_authorize_group_datail a
+        <where>
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable='1'
+        </where>
+    </select>
+    <update id="updateBySidIsDelete">
+        UPDATE sys_authorize_group_datail
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+    <delete id="deleteByGroupSid">
+        delete from  sys_authorize_group_datail
+        where groupSid =#{groupSid}
+    </delete>
 
     <!--将该资源下的所有一级菜单列表-->
     <select id="getGroupByOrgSid"  resultType="com.yxt.portal.biz.sysmenu.SysMenuTreeVo">
         SELECT *
         FROM sys_authorize_group gr
-        LEFT JOIN sys_org_authorize au ON gr.sid = au.ahthorizeGroupSid
+        LEFT JOIN sys_org_authorize au ON gr.sid = au.authorizeGroupSid
         WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1
         ORDER BY menu.sortNo ASC
     </select>

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(门户建设) <br/>
@@ -22,10 +36,76 @@ import java.util.List;
 public class SysAuthorizeGroupDetailService extends MybatisBaseService<SysAuthorizeGroupDetailMapper, SysAuthorizeGroupDetail> {
 
 
+    public ResultBean<PagerVo<SysAuthorizeGroupDetailVo>> listPage(PagerQuery<SysAuthorizeGroupDetailQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        SysAuthorizeGroupDetailQuery query = pq.getParams();
+        QueryWrapper<SysAuthorizeGroupDetail> qw = new QueryWrapper<>();
 
+        qw.ne("a.isDelete","1");
+        IPage<SysAuthorizeGroupDetail> page = PagerUtil.queryToPage(pq);
+        IPage<SysAuthorizeGroupDetailVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<SysAuthorizeGroupDetailVo> p = PagerUtil.pageToVo(pagging, null);
+        List<SysAuthorizeGroupDetailVo> records = pagging.getRecords();
+        return rb.success().setData(p);
+    }
+    public ResultBean<List<SysAuthorizeGroupDetail>> listAll(OrgPathQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysAuthorizeGroupDetailVo> pagging = baseMapper.listAll(query.getOrgPath());
+        return rb.success().setData(pagging);
+    }
+
+    public ResultBean<String> saveOrUpdate(List<SysAuthorizeGroupDetailDto> dtos) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = "";
+        if(dtos.size()!=0){
+            baseMapper.delete(new QueryWrapper<SysAuthorizeGroupDetail>().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<SysAuthorizeGroupDetailVo> 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<List<SysAuthorizeGroupDetailVo>> getDetailByGroupSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysAuthorizeGroupDetailVo> vo = baseMapper.getDetailByGroupSid(sid);
+        return rb.success().setData(vo);
+    }
 
-    public List<SysAuthorizeGroupDetailVo> 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<SysAuthorizeGroupDetailVo> getGroupByOrgSid(SysAuthorizeGroupDetailQuery query) {
         return baseMapper.getGroupByOrgSid(query.getOrgSid(),query.getSourceSid());
     }
 

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<SysAuthorizeGroupDetailVo> children;
-    @ApiModelProperty("是否选中，1：未选中,0：选中")
-    private String checked;
-    @ApiModelProperty("资源名称")
-    private String sourceName;
-    private String cid;
 }

src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml

@@ -21,9 +21,11 @@
         </where>
     </select>
     <select id="listAllParentByRoleSid" resultType="com.yxt.portal.biz.sysmenu.SysMenuVo">
-        SELECT menu.*, ISNULL(menuRole.sid) as checked
-        FROM sys_menu menu
-        left join sys_role_authorize menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1}
+        SELECT
+        menu.*, ISNULL(menuRole.sid) as checked
+        FROM
+        sys_menu menu
+        LEFT JOIN sys_role_authorize menuRole ON menu.sid = menuRole.menuSid  AND menuRole.roleSid = #{param1} and menuRole.sourceSid = #{sourceSid}
                 where menu.pSid = #{param2} and menu.isDelete!='1'
         <if test="sourceSid != null">
             and menu.sourceSid = #{sourceSid}
@@ -35,7 +37,7 @@
         left join sys_role_authorize menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1}
         left join sys_authorize_group_detail a on a.menuSid=menu.sid
         left join sys_authorize_group c on c.sid =a.groupSid
-        left join sys_org_authorize b on b.ahthorizeGroupSid=c.sid
+        left join sys_org_authorize b on b.authorizeGroupSid=c.sid
         where menu.pSid = #{param2}
         <if test="sourceSid != null">
             and a.sourceSid = #{sourceSid}
@@ -162,7 +164,7 @@
         FROM sys_menu menu
                  LEFT JOIN sys_source source ON menu.sourceSid = source.sid
                  left join sys_authorize_group a on a.menuSid=menu.sid
-                 left join sys_org_authorize b on b.ahthorizeGroupSid=a.sid
+                 left join sys_org_authorize b on b.authorizeGroupSid=a.sid
         WHERE a.sourceSid = #{sourceSid} and b.orgSid =#{orgSid} AND menu.psid='0' and menu.isDelete!=1
         ORDER BY menu.sortNo ASC
     </select>

src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java

@@ -435,14 +435,14 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
         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<SysMenu> selectByMenuUrl(String menuUrl) {

src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -36,6 +36,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrganizationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysOrganization> qw);
 
     List<SysOrganizationVo> selectFirstOrgList(@Param("orgSid")String orgSid);
+    List<SysOrganizationVo> selectFirstOrgList1(@Param("orgSid")String orgSid);
 
     List<SysOrganizationVo> selectChildrenListByPsid(@Param("psid") String psid);
 

src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -41,6 +41,14 @@
             and sid=#{orgSid}
         </if>
     </select>
+    <select id="selectFirstOrgList1" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
+        SELECT sid, name, psid, orgCode
+        FROM sys_organization
+        WHERE  psid='x' and isDelete!="1"
+        <if test="orgSid!=null and orgSid!=''">
+            and sid=#{orgSid}
+        </if>
+    </select>
 
     <select id="selectChildrenListByPsid" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
         SELECT sid, name, psid, orgCode

src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationService.java

@@ -148,7 +148,14 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     }
 
     public List<SysOrganizationVo> listVo(String orgSid) {
-        List<SysOrganizationVo> sysOrganizations = baseMapper.selectFirstOrgList(orgSid);
+        SysOrganization s=baseMapper.selectOne(new QueryWrapper<SysOrganization>().eq("sid",orgSid));
+        List<SysOrganizationVo> sysOrganizations=new ArrayList<>();
+        if(s.getPsid().equals("x")){
+            sysOrganizations = baseMapper.selectFirstOrgList1(orgSid);
+        }else{
+            sysOrganizations = baseMapper.selectFirstOrgList(orgSid);
+        }
+
         getChildList(sysOrganizations);
         return sysOrganizations;
     }

src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorize.java

@@ -18,13 +18,14 @@ import lombok.Data;
  * @version 1.0
  * @since 1.0
  */
-@ApiModel(value = "角色授权表", description = "角色授权表")
-@TableName("sys_role_authorize")
+@ApiModel(value = "组织授权表", description = "组织授权表")
+@TableName("sys_org_authorize")
 @Data
 public class SysOrgAuthorize extends BaseEntity {
     private static final long serialVersionUID = 1L;
     private String orgSid;//组织
     private String sourceSid;//资源sid
     private String menuSid;//菜单sid
-    private String funcSid;//功能sid
+    private String funSid;//功能sid
+    private String authorizeGroupSid;//功能sid
 }

src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeDto.java

@@ -5,6 +5,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysSourceDto.java <br/>
@@ -22,11 +24,13 @@ import lombok.Data;
 @Data
 public class SysOrgAuthorizeDto implements Dto {
 
-
+    private String sid;
     private String orgSid;//组织
     private String sourceSid;//资源sid
     private String menuSid;//菜单sid
-    private String funcSid;//功能sid
+    private String funSid;//功能sid
     private String roleSid;//角色sid
+    private String authorizeGroupSid;//功能sid
+    private List<String> groupSids;
 
 }

src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeMapper.java

@@ -2,6 +2,7 @@ package com.yxt.portal.biz.sysorgauthorize;
 
 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.sysroleauthorize.SysMenuRoleVo;
 import com.yxt.portal.biz.sysroleauthorize.SysRoleAuthorizeVo;
@@ -27,8 +28,12 @@ import java.util.List;
 @Mapper
 public interface SysOrgAuthorizeMapper extends BaseMapper<SysOrgAuthorize> {
 
+    int deleteBySid(List<String> list);
 
-
-    List<SysMenuRoleVo> list(@Param(Constants.WRAPPER) QueryWrapper<SysOrgAuthorizeVo> qw);
+    List<SysOrgAuthorizeVo2> getRegistrationInformation(String sid);
+    IPage<SysOrgAuthorizeVo> listPage(IPage<SysOrgAuthorize> page, @Param(Constants.WRAPPER) QueryWrapper<SysOrgAuthorize> qw);
+    List<SysOrgAuthorizeVo> listAll();
+    
+    
 
 }

src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeMapper.xml

@@ -3,5 +3,54 @@
 <mapper namespace="com.yxt.portal.biz.sysorgauthorize.SysOrgAuthorizeMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-
+    <select id="listPage" resultType="com.yxt.portal.biz.sysorgauthorize.SysOrgAuthorizeVo">
+        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
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        GROUP BY
+        a.sid
+    </select>
+    <select id="listAll" resultType="com.yxt.portal.biz.sysauthorizegroup.SysAuthorizeGroupVo">
+        select
+        *
+        from sys_org_authorize a
+        <where>
+            a.isDelete !='1' and a.isEnable='1'
+        </where>
+    </select>
+    <select id="getRegistrationInformation" resultType="com.yxt.portal.biz.sysorgauthorize.SysOrgAuthorizeVo2">
+        SELECT
+            c.sourceName,
+            c.sid as sourceSid,
+            b.createTime,
+            a.expireDate,
+            a.regType,
+            a.orgSid
+        FROM
+            sys_org_register a
+                LEFT JOIN sys_organization b ON b.sid = a.orgSid
+                LEFT JOIN sys_source c ON c.sid = a.sourceSid
+        WHERE
+            a.orgSid =#{orgSid}
+    </select>
+    <delete id="deleteBySid">
+        delete from sys_authorize_group
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
 </mapper>

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

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(门户建设) <br/>
@@ -33,67 +33,94 @@ import java.util.Objects;
  */
 @Service
 public class SysOrgAuthorizeService extends MybatisBaseService<SysOrgAuthorizeMapper, SysOrgAuthorize> {
-	@Autowired
-	SysMenuService sysMenuService;
-	@Autowired
-	SysRoleService sysRoleService;
 
 
-	/**
-	 * 解析和组装查询条件，封装在qw中
-	 *
-	 * @param query
-	 * @return
-	 */
-	private QueryWrapper<SysOrgAuthorizeVo> buildQueryWrapper(SysOrgAuthorizeQuery query) {
-		QueryWrapper<SysOrgAuthorizeVo> 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<PagerVo<SysOrgAuthorizeVo>> listPage(PagerQuery<SysOrgAuthorizeQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		SysOrgAuthorizeQuery query = pq.getParams();
+		QueryWrapper<SysOrgAuthorize> 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<SysOrgAuthorize> page = PagerUtil.queryToPage(pq);
+		IPage<SysOrgAuthorizeVo> pagging = baseMapper.listPage(page, qw);
+		PagerVo<SysOrgAuthorizeVo> p = PagerUtil.pageToVo(pagging, null);
+		for (SysOrgAuthorizeVo record : p.getRecords()) {
+			List<String> sids=new ArrayList<>();
+			List<SysOrgAuthorize> sysOrgAuthorize=baseMapper.selectList(new QueryWrapper<SysOrgAuthorize>().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<List<SysOrgAuthorize>> listAll( ) {
+		ResultBean rb = ResultBean.fireFail();
+		List<SysOrgAuthorizeVo> pagging = baseMapper.listAll();
+		return rb.success().setData(pagging);
+	}
 
-		return qw;
+	public ResultBean<String> saveOrUpdate(SysOrgAuthorizeDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		String sid = "";
+		baseMapper.delete(new QueryWrapper<SysOrgAuthorize>().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<SysMenuRoleVo> list(SysOrgAuthorizeQuery query) {
-		// mybits所用的查询条件封装类
-		QueryWrapper<SysOrgAuthorizeVo> qw = buildQueryWrapper(query);
-		return baseMapper.list(qw);
+
+	public ResultBean<SysOrgAuthorizeVo> 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<Map<String, Object>> getSourceMenuTreeOfRoles(SysOrgAuthorizeQuery query, Map<String, Object> map_rolemenus) {
 
-		//获取当前资源的菜单列表
-		List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
-		if (null == query)
-			return list_menus_map;
 
-		//角色s的某个资源的所有菜单列表
-		List<SysMenuRoleVo> 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<List<SysOrgAuthorizeVo2>> getRegistrationInformation(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<SysOrgAuthorizeVo2> vo2s= baseMapper.getRegistrationInformation(sid);
+		return rb.success().setData(vo2s);
 	}
 
 

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(门户建设) <br/>
  * File: SysSourceVo.java <br/>
@@ -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<String> groupSids;//权限组
+
 }

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

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

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

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<SysOrgRegisterMapper, SysOrgRegister> {
 
 
-
+    public ResultBean<String> saveOrUpdate(List<SysOrgRegisterDto> dtos) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.delete(new QueryWrapper<SysOrgRegister>().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<SysMenuTreeVo> listMenuTreeVo(String sourceSid) {
         return baseMapper.listMenuTreeVo(sourceSid);

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

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
         <where>
             ${ew.sqlSegment}
         </where>

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

src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java

@@ -29,6 +29,6 @@ public interface SysRoleAuthorizeMapper extends BaseMapper<SysRoleAuthorize> {
 
     List<SysMenuRoleVo> list(@Param(Constants.WRAPPER) QueryWrapper<SysRoleAuthorizeVo> qw);
     List<SysRoleAuthorizeVo> 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);
+
 }

src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.xml

@@ -30,4 +30,12 @@
         from sys_role_authorize
         where roleSid = #{roleSid}
     </select>
+    <delete id="delByRoleSid">
+        delete from sys_role_authorize
+               where
+        roleSid=#{roleSid}
+        <if test="sourceSid!='' and sourceSid!=null">
+            and sourceSid =#{sourceSid}
+        </if>
+    </delete>
 </mapper>

src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java

@@ -128,6 +128,40 @@ public class SysRoleAuthorizeService extends MybatisBaseService<SysRoleAuthorize
 		}
 		return rb.success();
 	}
+	public ResultBean updateRoleAndMenuAdmin(List<SysRoleAuthorizeDto> 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<SysRoleAuthorizeVo> 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<SysRoleAuthorizeVo> selectByRoleSid(String roleSid) {
 		return baseMapper.selectByRoleSid(roleSid);
 	}

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;
     

src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java

@@ -62,7 +62,7 @@ public class SysSourceService extends MybatisBaseService<SysSourceMapper, SysSou
 			qw.eq("pageUrl", query.getPageUrl());
 		}
 
-		if (query.getIconUrl() != null) {
+		if (StringUtils.isNotBlank(query.getIconUrl())) {
 			qw.eq("iconUrl", query.getIconUrl());
 		}
 
@@ -74,7 +74,7 @@ public class SysSourceService extends MybatisBaseService<SysSourceMapper, SysSou
 			qw.eq("urlSign", query.getUrlSign());
 		}
 
-		if (query.getSortNo() != null) {
+		if (StringUtils.isNotBlank(query.getIconUrl())) {
 			qw.eq("sortNo", query.getSortNo());
 		}
 
@@ -132,7 +132,12 @@ public class SysSourceService extends MybatisBaseService<SysSourceMapper, SysSou
 	
 	public void saveOrUpdateDto(SysSourceDto dto){
 		SysSource entity = new SysSource();
-		dto.fillEntity(entity);
+		if(StringUtils.isNotBlank(dto.getSid())){
+			BeanUtil.copyProperties(dto,entity);
+		}else{
+			dto.fillEntity(entity);
+		}
+
 		this.saveOrUpdate(entity);
 	}
 	

src/main/java/com/yxt/portal/biz/syssource/SysSourceVo.java

@@ -26,7 +26,7 @@ import java.util.List;
 @Data
 public class SysSourceVo implements Vo {
 
-    
+    private String id;
 	@ApiModelProperty("父资源sid")
     private String pSid;
     

src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.java

@@ -37,6 +37,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     //IPage<SysUserVo> voPage(IPage<SysUser> page, @Param(Constants.WRAPPER) QueryWrapper<SysUser> qw);
 
     IPage<SysUserVo> selectPageVo(IPage<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> ew, @Param("orgName") String orgName, @Param("userName") String userName,@Param("orgSid") String orgSid);
+    IPage<SysUserVo> selectPageVoAdmin(IPage<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> ew, @Param("orgName") String orgName, @Param("userName") String userName);
 
     List<SysUserVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysUser> qw);
 

src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml

@@ -118,6 +118,121 @@
             </if>
         </where>
     </select>
+    <select id="selectPageVoAdmin" resultType="com.yxt.portal.biz.sysuser.SysUserVo">
+        SELECT DISTINCT user.staffSid,
+        user.userType,
+        user.accountType,
+        user.createTime,
+        user.isEnable,
+        (
+        SELECT GROUP_CONCAT(org.name)
+        FROM sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE staffOrg.staffSid = user.staffSid
+        ) departmentName,
+        (
+        SELECT GROUP_CONCAT(org.sid)
+        FROM sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE staffOrg.staffSid = user.staffSid and staffOrg.manageType!=2
+        ) departmentSid,
+        (
+        SELECT
+        GROUP_CONCAT( org.sid )
+        FROM
+        sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE
+        staffOrg.staffSid = USER.staffSid
+        AND staffOrg.manageType != 2
+        ) orgSid,
+        (
+        SELECT GROUP_CONCAT(post.name)
+        FROM sys_staff_post staffPost
+        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+        WHERE staffPost.staffSid = user.staffSid
+        ) postName,
+        (
+        SELECT GROUP_CONCAT(post.sid)
+        FROM sys_staff_post staffPost
+        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+        WHERE staffPost.staffSid = user.staffSid
+        ) postSid,
+        user.userName,
+        user.sid sid,
+        staff.name,
+        (
+        SELECT GROUP_CONCAT(role.name)
+        FROM sys_user_role user_role
+        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+        WHERE user_role.userSid = USER.sid and user_role.orgSid=SUBSTRING_INDEX(c.orgSidPath,'/',1)
+        ) roleName
+        -- dict.dictValue userType,
+        FROM sys_user USER
+        LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
+        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+        -- LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
+        LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
+        left join sys_staff_org a on a.staffSid=staff.sid
+        left join sys_org_authorize b on b.orgSid=a.orgSid
+        left join sys_organization c on c.sid=a.orgSid
+
+        <where>
+            ${ew.sqlSegment}
+            <if test="orgName != null and orgName != ''">
+                AND (SELECT GROUP_CONCAT(org.name)
+                FROM sys_staff_org staffOrg
+                LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                WHERE staffOrg.staffSid = user.staffSid)
+                LIKE concat('%',
+                #{orgName}
+                ,
+                '%'
+                )
+            </if>
+            <if test="userName != null and userName != ''">
+                and
+                concat
+                (
+                IFNULL
+                (
+                USER
+                .
+                userName
+                ,
+                ''
+                )
+                ,
+                ifnull
+                (
+                USER
+                .
+                mobile
+                ,
+                ''
+                )
+                ,
+                ifnull
+                (
+                staff
+                .
+                name
+                ,
+                ''
+                )
+                )
+                LIKE
+                concat
+                (
+                '%'
+                ,
+                #{userName}
+                ,
+                '%'
+                )
+            </if>
+        </where>
+    </select>
 
     <select id="selectListAllVo" resultType="com.yxt.portal.biz.sysuser.SysUserVo">
         SELECT *

src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java

@@ -146,7 +146,97 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 //        qw.ne("staff.personTypeKey", "01");
         return qw;
     }
+    private QueryWrapper<SysUser> createQueryWrapperAdmin(SysUserQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysUser> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getRoleSid())) {
+            qw.eq("role.sid", query.getRoleSid());
+        }
+        qw.ne("USER.isDelete","1");
+//        qw.apply("c.orgSidPath like (%"+query.getOrgSid()+")");
+//        qw.eq("b.sourceSid",query.getSourceSid());
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("staff.name", query.getName());
+        }
+        qw.apply(" user_role.orgSid is not null");
+//        qw.ne("staff.personTypeKey", "01");
+        return qw;
+    }
+    public PagerVo<SysUserVo> listPageVoAdmin(PagerQuery<SysUserQuery> pq) {
+        ResultBean rb=new ResultBean().fail();
+        SysUserQuery query = pq.getParams();
+        QueryWrapper<SysUser> qw = createQueryWrapperAdmin(query);
+        IPage<SysUser> page = PagerUtil.queryToPage(pq);
+        String deptName = "";
+        String userName = "";
+        if (StringUtils.isNotBlank(query.getOrgName())) {
+            deptName = query.getOrgName().trim();
+        }
+        if (StringUtils.isNotBlank(query.getUserName())) {
+            userName = query.getUserName().trim();
+        }
+
+        IPage<SysUserVo> pagging = baseMapper.selectPageVoAdmin(page, qw, deptName, userName);
+        List<SysUserVo> records = pagging.getRecords();
+        for (SysUserVo record : records) {
+            SysOrganization d =sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",record.getOrgSid()));
+            d.setOrgSidPath(d.getOrgSidPath()+"/");
+            String b[]=d.getOrgSidPath().split("/");
+            record.setSysRoleVos(sysUserRoleService.selByUserSid(record.getSid(),b[0]));
+            for (SysUserRoleVo sysRoleVo : record.getSysRoleVos()) {
+                if(StringUtils.isBlank(record.getRoles())){
+                    record.setRoles(sysRoleVo.getName());
+                }else{
+                    record.setRoles(record.getRoles()+","+sysRoleVo.getName());
+                }
+            }
+            if(record.getUserType().equals("1")){
+                record.setUserTypeValue("员工");
+            }else if(record.getUserType().equals("2")){
+                record.setUserTypeValue("客户");
+            } else if(record.getUserType().equals("3")){
+                record.setUserTypeValue("供应商");
+            }
+            if(record.getAccountType().equals("0")){
+                record.setAccountTypeValue("平台管理员");
+            }else if(record.getAccountType().equals("1")){
+                record.setAccountTypeValue("单位管理员");
+            } else if(record.getAccountType().equals("2")){
+                record.setAccountTypeValue("操作员");
+            }else if(record.getAccountType().equals("3")){
+                record.setAccountTypeValue("非登录账户 ");
+            }
 
+            String departmentSid = record.getDepartmentSid();
+            String orgName = "";
+            if (StringUtils.isNotBlank(departmentSid)) {
+                String[] split = departmentSid.split(",");
+                for (String s : split) {
+                    //获取本级sid获取本级部门信息
+                    SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s);
+                    //从本级部门信息中获取上级sid
+                    String psid = sysOrganization.getPsid();
+                    //从本级部门信息中获取本级部门名称
+                    String bjName = sysOrganization.getName();
+                    //获取上级sid获取上级部门信息
+                    SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid);
+                    //从上级部门信息中获取上级部门名称
+
+                    if(null!=sysOrganization1){
+                        String sjName = sysOrganization1.getName();
+                        orgName += sjName + "-" + bjName + ",";
+                    }else{
+                        orgName+=bjName;
+                    }
+                }
+                orgName = orgName.substring(0, orgName.length() - 1);
+                record.setDepartmentName(orgName);
+            }
+        }
+        PagerVo<SysUserVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
     public PagerVo<SysUserVo> listPageVo(PagerQuery<SysUserQuery> pq) {
         ResultBean rb=new ResultBean().fail();
         SysUserQuery query = pq.getParams();
@@ -422,10 +512,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
                     if (sysOrganizationOne != null) {
                         String psid = sysOrganizationOne.getPsid();
+                        String sid = sysOrganizationOne.getSid();
                         if(StringUtils.isNotNull(psid)){
                             if(!psid.equals("0")){
-                                String name = sysOrganizationService.fetchBySid(psid).getName();
-                                userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
+                                if(psid.equals("x")){
+                                    String name = sysOrganizationService.fetchBySid(sid).getName();
+                                    userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
+                                }else{
+                                    String name = sysOrganizationService.fetchBySid(psid).getName();
+                                    userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
+                                }
+
                             }else{
                                 userInfoOneVo.setPNameAndDepartmentNameAndPostName(sysStaffOrgVo.getOrgName());
                             }