菜单

gateway/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.yxt.gateway</groupId>
-    <artifactId>gateway</artifactId>
+    <artifactId>omsgateway</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java

@@ -83,7 +83,9 @@ public class SysOrganizationRest {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean update(SysOrganizationDto dto, String sid){
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysOrganizationDto dto, @PathVariable("sid") String sid){
         return sysOrganizationService.updateBySid(dto, sid);
     }
 

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java

@@ -38,9 +38,9 @@ public class SysRoleRest {
 
 
 	@ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
-	@PostMapping("/listAllByUserSid/{userSid}")
+	@PostMapping("/listAllByUserSid/{userSid}/{orgSid}")
-	public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid){
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid){
-		return sysRoleService.listAllByUserSid(userSid);
+		return sysRoleService.listAllByUserSid(userSid,orgSid);
 	}
 
 

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java

@@ -48,4 +48,5 @@ public class SysMenu extends BaseEntity {
     
 	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
     private String menuType;
+    private String cid;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java

@@ -69,4 +69,5 @@ public class SysMenuDto implements Dto {
 
     @ApiModelProperty(value = "备注")
     private String remarks;
+    private String cid;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java

@@ -56,7 +56,8 @@ public class SysMenuTreeVo implements Vo {
     private String remarks;
     @ApiModelProperty("子菜单")
     private List<SysMenuTreeVo> children;
-
     private String menuType;
     private String isShow;
+    private String menuTypeValue;
+    private String cid;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java

@@ -71,4 +71,5 @@ public class SysMenuVo implements Vo {
     private String checked;
     @ApiModelProperty("资源名称")
     private String sourceName;
+    private String cid;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java

@@ -35,4 +35,6 @@ public class SysRoleQuery implements Query {
     
 	@ApiModelProperty("1、系统管理员、2、普通角色")
     private Integer type;
+    private String orgSid;//组织
+    private String sourceSid;//资源
 }

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java

@@ -93,8 +93,8 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
         return sysRoleFeign.fetchByUserSid(userSid);
     }
 
-    public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid,String orgSid) {
-        return sysRoleFeign.listAllByUserSid(userSid);
+        return sysRoleFeign.listAllByUserSid(userSid, orgSid);
     }
 
     /**

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java

@@ -44,6 +44,7 @@ public class SysRoleVo implements Vo {
     private String postName;
     @ApiModelProperty(value = "组织层级")
     private String roleTypeValue;
-    private String dataRuleId;//角色数据权限id
+    private String dataRuleId;
-    private String dataRuleValue;//
+    private String dataRuleValue;
+    private String orgSid;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java

@@ -71,11 +71,12 @@ public class SysUserService {
      * @param sid 用户sid
      * @return ResultBean
      */
-    public ResultBean initPwd(String sid) {
+
+    public ResultBean initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) {
         return sysUserFeign.initPwd(sid);
     }
 
-    public ResultBean delBySid(String sid) {
+    public ResultBean delBySid(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) {
         return sysUserFeign.delBySid(sid);
     }
 }

oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java

@@ -23,11 +23,11 @@ import lombok.Data;
 @Data
 public class SysUserRoleVo implements Vo {
 
-    
+
-	@ApiModelProperty("用户sid")
+    @ApiModelProperty("用户sid")
     private String userSid;
-    
+
-	@ApiModelProperty("角色sid")
+    @ApiModelProperty("角色sid")
     private String roleSid;
     private String name;
 }

oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java

@@ -30,8 +30,8 @@ public interface SysRoleFeign {
     @PostMapping("/listAll")
     public ResultBean<List<SysRoleVo>> listAll(@RequestBody SysRoleQuery query);
     @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
-    @PostMapping("/listAllByUserSid/{userSid}")
+    @PostMapping("/listAllByUserSid/{userSid}/{orgSid}")
-    public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid);
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid);
 
     @ApiOperation("根据用户sid查询用户的角色列表")
     @PostMapping("/fetchByUserSid/{userSid}")

oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java

@@ -24,7 +24,7 @@ public class SysRoleFeignFallback implements SysRoleFeign {
 	}
 
 	@Override
-	public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid, String orgSid) {
 		return null;
 	}
 

oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import com.yxt.oms.biz.func.sysrole.SysRoleVo;
+import com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,42 +35,42 @@ public class SysUserVo implements Vo {
     private static final long serialVersionUID = 2415131854581950721L;
     @ApiModelProperty("部门sid")
     private String departmentSid;
-	@ApiModelProperty("部门名称")
+    @ApiModelProperty("部门名称")
     private String departmentName;
     @ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
     @JsonProperty("pNameAndDepartmentNameAndPostName")
     private String pNameAndDepartmentNameAndPostName;
-	@ApiModelProperty("岗位名称")
+    @ApiModelProperty("岗位名称")
     private String  postName;
-	@ApiModelProperty("岗位Sid")
+    @ApiModelProperty("岗位Sid")
     private String  postSid;
     @ApiModelProperty("单位sid")
     private String organizationSid;
-	@ApiModelProperty("单位名称")
+    @ApiModelProperty("单位名称")
     private String organizationName;
-	@ApiModelProperty("用户姓名")
+    @ApiModelProperty("用户姓名")
     private String name;
-	@ApiModelProperty("登录名，登录名不能相同")
+    @ApiModelProperty("登录名，登录名不能相同")
     private String userName;
 
     @ApiModelProperty("id")
     private Integer id;
-	@ApiModelProperty("用户sid")
+    @ApiModelProperty("用户sid")
     private String sid;
     @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
     private String isAdmin;
     @ApiModelProperty("角色名称")
     private String roleName;
 
-	@ApiModelProperty("关联的人员sid")
+    @ApiModelProperty("关联的人员sid")
     private String staffSid;
-    
+
-	@ApiModelProperty("手机号")
+    @ApiModelProperty("手机号")
     private String mobile;
     @ApiModelProperty(value = "禁用状态")
     private String isEnable;
-    
+
-	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    @ApiModelProperty("用户类型:1员工、2客户、3供应商")
     private String userType;
     @ApiModelProperty("用户类型:1、2、3")
     private String userTypeValue;
@@ -101,7 +102,7 @@ public class SysUserVo implements Vo {
     List<SysStaffOrgVo> sysOrganizationVos;
     private String orgSid;
     private String orgName;
-    private List<SysRoleVo> sysRoleVos;
+    private List<SysUserRoleVo> sysRoleVos;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
     private String roles;//角色 ,分割