From 9c06aeeb95e887282cc601beb7ede0a67fe74461 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 17 May 2024 09:44:33 +0800
Subject: [PATCH] portal

---
 .../apiadmin/func/SysRoleAuthorizeRest.java   | 29 ++++++++++
 .../yxt/wms/apiadmin/func/SysUserRest.java    | 25 ++++++++-
 .../wms/biz/func/sysmenu/SysMenuQuery.java    |  2 +
 .../com/yxt/wms/biz/func/sysrole/SysRole.java |  1 +
 .../yxt/wms/biz/func/sysrole/SysRoleDto.java  |  1 +
 .../func/sysroleauthorize/SysMenuRoleVo.java  | 55 +++++++++++++++++++
 .../sysroleauthorize/SysRoleAuthorize.java    | 31 +++++++++++
 .../sysroleauthorize/SysRoleAuthorizeDto.java | 32 +++++++++++
 .../SysRoleAuthorizeMapper.java               | 34 ++++++++++++
 .../SysRoleAuthorizeMapper.xml                | 33 +++++++++++
 .../SysRoleAuthorizeQuery.java                | 41 ++++++++++++++
 .../SysRoleAuthorizeService.java              | 42 ++++++++++++++
 .../sysroleauthorize/SysRoleAuthorizeVo.java  | 31 +++++++++++
 .../wms/biz/func/sysuser/SysUserService.java  | 11 ++++
 .../SysRoleAuthorizeFeign.java                | 41 ++++++++++++++
 .../SysRoleAuthorizeFeignFallback.java        | 32 +++++++++++
 .../feign/portal/sysuser/SysStaffOrgVo.java   | 49 +++++++++++++++++
 .../wms/feign/portal/sysuser/SysUserDto.java  | 13 +++--
 .../feign/portal/sysuser/SysUserFeign.java    | 18 ++++++
 .../portal/sysuser/SysUserFeignFallback.java  | 15 +++++
 .../feign/portal/sysuser/SysUserQuery.java    | 12 ++--
 .../wms/feign/portal/sysuser/SysUserVo.java   |  3 +
 22 files changed, 538 insertions(+), 13 deletions(-)
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysRoleAuthorizeRest.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysMenuRoleVo.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorize.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeDto.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.xml
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeQuery.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeVo.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java
 create mode 100644 wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysStaffOrgVo.java

diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysRoleAuthorizeRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysRoleAuthorizeRest.java
new file mode 100644
index 0000000..b3def96
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysRoleAuthorizeRest.java
@@ -0,0 +1,29 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeDto;
+import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeService;
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2024/5/15 16:00
+ */
+@Api(tags = "角色授权表")
+@RestController
+@RequestMapping("apiadmin/sysrikeauthorize")
+public class SysRoleAuthorizeRest {
+    @Autowired
+    SysRoleAuthorizeService sysRoleAuthorizeService;
+    @ApiOperation("修改角色的菜单配置")
+    @PostMapping("/updateRoleAndMenu")
+    public ResultBean updateRoleAndMenu(@RequestBody SysRoleAuthorizeDto dto){
+        return sysRoleAuthorizeService.updateRoleAndMenu(dto);
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRest.java
index 8446b78..8c314d3 100644
--- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRest.java
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRest.java
@@ -9,6 +9,7 @@ import com.yxt.wms.feign.portal.sysuser.SysUserQuery;
 import com.yxt.wms.feign.portal.sysuser.SysUserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,7 +19,7 @@ import javax.servlet.http.HttpServletRequest;
  * @author wangpengfei
  * @date 2024/5/6 10:29
  */
-@Api(tags = "供应商信息")
+@Api(tags = "用户信息")
 @RestController
 @RequestMapping("/apiadmin/sysuser")
 public class SysUserRest {
@@ -68,8 +69,28 @@ public class SysUserRest {
 
     @PostMapping("/listPage")
     @ResponseBody
-
     public ResultBean listPage(@RequestBody PagerQuery<SysUserQuery> pq){
         return sysUserService.listPage(pq);
     }
+
+    @PostMapping("/bindOrganization")
+    @ResponseBody
+    @ApiOperation(value = "绑定组织")
+    @ApiOperationSupport(order = 30)
+    public ResultBean bindOrganization(@RequestBody SysUserDto dto){
+        return  sysUserService.bindOrganization(dto);
+    }
+    @PostMapping("/selOrganization")
+    @ResponseBody
+    @ApiOperation(value = "选择所登录的组织")
+    @ApiOperationSupport(order = 30)
+    public ResultBean selOrganization(@RequestBody SysUserDto dto){
+        return  sysUserService.selOrganization(dto);
+    }
+    @PostMapping("/setIsEnable/{sid}/{isEnable}")
+    @ResponseBody
+    @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")
+    public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){
+        return sysUserService.setIsEnable(sid,isEnable);
+    }
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuQuery.java
index dfd1cc5..394e7dc 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuQuery.java
@@ -63,4 +63,6 @@ public class SysMenuQuery implements Query {
     
 	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
     private String menuType;
+    private String orgSid;//部门
+
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java
index 30c6400..3df9c9b 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java
@@ -45,4 +45,5 @@ public class SysRole extends BaseEntity {
     private String roleType;
     @ApiModelProperty(value = "角色组织层级value")
     private String roleTypeValue;
+    private String orgSid;
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java
index 9079b30..fb54638 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java
@@ -48,4 +48,5 @@ public class SysRoleDto implements Dto {
     private String roleType;
     @ApiModelProperty(value = "角色组织层级value")
     private String roleTypeValue;
+    private String orgSid;
 }
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysMenuRoleVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysMenuRoleVo.java
new file mode 100644
index 0000000..cd555ec
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysMenuRoleVo.java
@@ -0,0 +1,55 @@
+package com.yxt.wms.biz.func.sysroleauthorize;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <br/>
+ * Description: 菜单与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+
+@Data
+public class SysMenuRoleVo implements Vo {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("菜单父级sid")
+    private String pSid;
+	@ApiModelProperty("menusid")
+    private String sid;
+	@ApiModelProperty("menuUrl")
+    private String menuUrl;
+    @ApiModelProperty("menuName")
+    private String menuName;
+    @ApiModelProperty("pageUrl")
+    private String pageUrl;
+    @ApiModelProperty("iconUrl")
+    private String iconUrl;
+    @ApiModelProperty("isShow")
+    private String isShow;
+    @ApiModelProperty("alwaysShow")
+    private Integer alwaysShow;
+    @ApiModelProperty("pageUrlRedirect")
+    private String pageUrlRedirect;
+    @ApiModelProperty("pageAliasName")
+    private String pageAliasName;
+    @ApiModelProperty("pageName")
+    private String pageName;
+    @ApiModelProperty("remarks")
+    private String remarks;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorize.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorize.java
new file mode 100644
index 0000000..c16cd17
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorize.java
@@ -0,0 +1,31 @@
+package com.yxt.wms.biz.func.sysroleauthorize;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSource.java <br/>
+ * Class: com.yxt.anrui.portal.api.syssource.SysSource <br/>
+ * Description: 资源表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色授权表", description = "角色授权表")
+@TableName("sys_role_authorize")
+@Data
+public class SysRoleAuthorize extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    private String roleSid;//角色sid
+    private String sourceSid;//资源sid
+    private String menuSid;//菜单sid
+    private String dataRuleId;//菜单的数据权限id
+    private String funcSid;//功能sid
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeDto.java
new file mode 100644
index 0000000..188b26b
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeDto.java
@@ -0,0 +1,32 @@
+package com.yxt.wms.biz.func.sysroleauthorize;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceDto <br/>
+ * Description: 资源表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源表 数据传输对象", description = "资源表 数据传输对象")
+@Data
+public class SysRoleAuthorizeDto implements Dto {
+
+
+    private String roleSid;//角色sid
+    private String sourceSid;//资源sid
+    private String menuSid;//菜单sid
+    private String dataRuleId;//菜单的数据权限id
+    private String funcSid;//功能sid
+
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.java
new file mode 100644
index 0000000..355604e
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.java
@@ -0,0 +1,34 @@
+package com.yxt.wms.biz.func.sysroleauthorize;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.syssource.SysSourceMapper <br/>
+ * Description: 角色授权表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysRoleAuthorizeMapper extends BaseMapper<SysRoleAuthorize> {
+
+
+
+    List<SysMenuRoleVo> list(@Param(Constants.WRAPPER) QueryWrapper<SysRoleAuthorizeVo> qw);
+    List<SysRoleAuthorizeVo> selectByRoleSid(String roleSid);
+    @Delete("delete from sys_menu_role where roleSid=#{roleSid}")
+    void delByRoleSid(@Param("roleSid") String roleSid);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.xml
new file mode 100644
index 0000000..9e240ad
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+    <select id="list" parameterType="com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeQuery"
+            resultType="com.yxt.wms.biz.func.sysroleauthorize.SysMenuRoleVo">
+        SELECT distinct rm.menuSid as sid,
+                        m.name     as menuName,
+                        m.menuUrl,
+                        m.pageUrl,
+                        m.pageName,
+                        m.pageUrlRedirect,
+                        m.pageAliasName,
+                        m.iconUrl,
+                        m.sourceSid,
+                        m.isShow,
+                        m.pSid,
+                        m.sortNo,
+                        m.remarks,
+                        1          as alwaysShow
+        FROM sys_role_authorize rm
+                 LEFT JOIN sys_menu m ON rm.menuSid = m.sid
+            ${ew.customSqlSegment}
+    </select>
+    <select id="selectByRoleSid" resultType="com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeVo">
+        select menuSid, dataRuleId
+        from sys_menu_role
+        where roleSid = #{roleSid}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeQuery.java
new file mode 100644
index 0000000..90b78f5
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeQuery.java
@@ -0,0 +1,41 @@
+package com.yxt.wms.biz.func.sysroleauthorize;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceQuery <br/>
+ * Description: 资源表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源表 查询条件", description = "资源表 查询条件")
+@Data
+public class SysRoleAuthorizeQuery implements Query {
+
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    @ApiModelProperty("多个角色sid计集合")
+    private List<String> roleSids;
+    @ApiModelProperty("资源sid")
+    private String sourceSid;
+    @ApiModelProperty("是否是系统管理员")
+    private String isAdmin;
+
+
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java
new file mode 100644
index 0000000..4d5e993
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java
@@ -0,0 +1,42 @@
+package com.yxt.wms.biz.func.sysroleauthorize;
+
+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.wms.feign.portal.sysroleauthorize.SysRoleAuthorizeFeign;
+import org.apache.commons.lang3.StringUtils;
+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;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.syssource.SysSourceService <br/>
+ * Description: 资源表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysRoleAuthorizeService extends MybatisBaseService<SysRoleAuthorizeMapper, SysRoleAuthorize> {
+	@Autowired
+	SysRoleAuthorizeFeign sysRoleAuthorizeFeign;
+
+
+
+	public ResultBean updateRoleAndMenu(SysRoleAuthorizeDto dto) {
+
+		return sysRoleAuthorizeFeign.updateRoleAndMenu(dto);
+	}
+
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeVo.java
new file mode 100644
index 0000000..091026c
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysroleauthorize/SysRoleAuthorizeVo.java
@@ -0,0 +1,31 @@
+package com.yxt.wms.biz.func.sysroleauthorize;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceVo.java <br/>
+ * Class: com.yxt.user.biz.syssource.SysSourceVo <br/>
+ * Description: 资源表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源表 视图数据对象", description = "资源表 视图数据对象")
+@Data
+public class SysRoleAuthorizeVo implements Vo {
+
+
+    private String roleSid;//角色sid
+    private String sourceSid;//资源sid
+    private String menuSid;//菜单sid
+    private String dataRuleId;//菜单的数据权限id
+    private String funcSid;//功能sid
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java
index 87ff16f..07ba024 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java
@@ -6,8 +6,10 @@ import com.yxt.wms.feign.portal.sysuser.SysUserDto;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserQuery;
 import com.yxt.wms.feign.portal.sysuser.SysUserVo;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -49,4 +51,13 @@ public class SysUserService {
     public ResultBean listPage(PagerQuery<SysUserQuery> pq){
         return sysUserFeign.listPage(pq);
     }
+    public ResultBean bindOrganization(SysUserDto dto){
+        return sysUserFeign.bindOrganization(dto);
+    }
+    public ResultBean selOrganization(SysUserDto dto){
+        return sysUserFeign.selOrganization(dto);
+    }
+    public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){
+        return sysUserFeign.setIsEnable(sid, isEnable);
+    }
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java
new file mode 100644
index 0000000..5fe3b04
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java
@@ -0,0 +1,41 @@
+package com.yxt.wms.feign.portal.sysroleauthorize;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeign <br/>
+ * Description: 资源表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "资源表")
+@FeignClient(
+        contextId = "ss-common-portal-SysOrgAuthorize",
+        name = "ss-common-portal",
+        path = "apiadmin/sysroleauthorize",
+        fallback = SysRoleAuthorizeFeignFallback.class)
+public interface SysRoleAuthorizeFeign {
+
+    @ApiOperation("修改角色的菜单配置")
+    @PostMapping("/updateRoleAndMenu")
+    public ResultBean updateRoleAndMenu(@RequestBody SysRoleAuthorizeDto dto);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java
new file mode 100644
index 0000000..628036a
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java
@@ -0,0 +1,32 @@
+package com.yxt.wms.feign.portal.sysroleauthorize;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeDto;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeignFallback <br/>
+ * Description: 资源表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SysRoleAuthorizeFeignFallback implements SysRoleAuthorizeFeign {
+
+
+    @Override
+    public ResultBean updateRoleAndMenu(SysRoleAuthorizeDto dto) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysStaffOrgVo.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysStaffOrgVo.java
new file mode 100644
index 0000000..9bba312
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysStaffOrgVo.java
@@ -0,0 +1,49 @@
+package com.yxt.wms.feign.portal.sysuser;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffOrgVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo <br/>
+ * Description: 员工部门关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工部门关联表 视图数据对象", description = "员工部门关联表 视图数据对象")
+@Data
+public class SysStaffOrgVo implements Vo {
+
+    
+	@ApiModelProperty("部门sid")
+    private String orgSid;
+    
+	@ApiModelProperty("部门名称")
+    private String orgName;
+    
+	@ApiModelProperty("人员sid")
+    private String staffSid;
+    
+//	@ApiModelProperty("部门路径")
+//    private String orgSidPath;
+//
+//	@ApiModelProperty("部门名称路径")
+//    private String orgNamePath;
+    
+	@ApiModelProperty("管理类型：1、主管。2、分管。3、员工")
+    private String manageType;
+	@ApiModelProperty("员工姓名")
+    private String staffName;
+	@ApiModelProperty("员工手机号")
+    private String mobile;
+    private String type="2";
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
index d6d3d9a..c1b8a49 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
@@ -24,24 +24,25 @@ import javax.validation.constraints.NotBlank;
 @ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象")
 @Data
 public class SysUserDto implements Dto {
-	@ApiModelProperty("手机号")
+    @ApiModelProperty("手机号")
     private String mobile;
-	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    @ApiModelProperty("用户类型:1员工、2客户、3供应商")
     private Integer userType;
     @ApiModelProperty(value = "姓名", required = true)
     @NotBlank(message = "姓名不能为空")
     private String name;
     @ApiModelProperty(value = "验证码", required = true)
     @NotBlank(message = "验证码不能为空")
-    private String verificationCode;
+    private String code;
     @ApiModelProperty(value = "部门sid")
     private String deptSid;
     @ApiModelProperty(value = "岗位sid")
     private String postSid;
     private String companyName;//公司名
     private String contacts;//联系人
-    private String provinces;//省
-    private String cities;//市
-    private String districts;//区
+    private String address;//省/市/区
+    private String userSid;
+    private String password;
+    private String orgSid;
 
 }
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java
index 1218473..a82fb9f 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java
@@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -58,4 +59,21 @@ public interface SysUserFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<SysUserVo>> listPage(@RequestBody PagerQuery<SysUserQuery> pq);
 
+    @PostMapping("/bindOrganization")
+    @ResponseBody
+    @ApiOperation(value = "绑定组织")
+    @ApiOperationSupport(order = 30)
+    public ResultBean bindOrganization(@RequestBody SysUserDto dto);
+
+    @PostMapping("/selOrganization")
+    @ResponseBody
+    @ApiOperation(value = "选择所登录的组织")
+    @ApiOperationSupport(order = 30)
+    public ResultBean selOrganization(@RequestBody SysUserDto dto);
+
+    @PostMapping("/setIsEnable/{sid}/{isEnable}")
+    @ResponseBody
+    @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")
+    public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable);
+
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java
index 6d87ffd..514c2ea 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java
@@ -50,4 +50,19 @@ public class SysUserFeignFallback implements SysUserFeign {
     public ResultBean<PagerVo<SysUserVo>> listPage(PagerQuery<SysUserQuery> pq) {
         return null;
     }
+
+    @Override
+    public ResultBean bindOrganization(SysUserDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean selOrganization(SysUserDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean setIsEnable(String sid, String isEnable) {
+        return null;
+    }
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserQuery.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserQuery.java
index a8710ae..f90c529 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserQuery.java
@@ -48,9 +48,11 @@ public class SysUserQuery implements Query {
     private String type;
     @ApiModelProperty(value = "是否是测试",example = "false")
     private Boolean isTest;
-    private Boolean companyName;//公司名
-    private Boolean contacts;//联系人
-    private Boolean provinces;//省
-    private Boolean cities;//市
-    private Boolean districts;//区
+    private String companyName;//公司名
+    private String contacts;//联系人
+    private String provinces;//省
+    private String cities;//市
+    private String districts;//区
+    private String orgSid;//组织
+    private String sourceSid;//资源
 }
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java
index 4e446ac..53f0918 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java
@@ -95,4 +95,7 @@ public class SysUserVo implements Vo {
     @ApiModelProperty("工号")
     private String jobNumber;
     List<SysOrganization> sysOrganizations;
+    List<SysStaffOrgVo> sysOrganizationVos;
+    private String orgSid;
+    private String orgName;
 }