权限2.0提交

src/main/java/com/ost/micro/modules/security/controller/LoginController.java

@@ -171,7 +171,7 @@ public class LoginController {
 
 
 		//商家账号停用
-		if(user.getBizStatus() == UserStatusEnum.DISABLE.value()){
+		if(null != user.getDeptStatus() && user.getDeptStatus() == UserStatusEnum.DISABLE.value()){
 			sysLog.setStatus(LoginStatusEnum.LOCK.value());
 			sysLog.setCreater(user.getId());
 			sysLog.setCreaterName(user.getUsername());

src/main/java/com/ost/micro/modules/sys/controller/SysRoleController.java

@@ -94,8 +94,14 @@ public class SysRoleController {
 	@RequiresPermissions("sys:role:list")
 	public Result<List<SysRoleDTO>> list(@ApiIgnore @RequestParam Map<String, Object> params){
 		List<SysRoleDTO> data = sysRoleService.list(params);
-
-
+		if (!CollectionUtils.isEmpty(data)) {
+			data.forEach(e->{
+				SysDeptDTO sysDeptDTO = sysDeptService.get(e.getDeptId());
+				if (null != sysDeptDTO) {
+					e.setDeptName(sysDeptDTO.getName());
+				}
+			});
+		}
 		return new Result<List<SysRoleDTO>>().ok(data);
 	}
 

src/main/java/com/ost/micro/modules/sys/controller/SysUserController.java

@@ -23,8 +23,11 @@ import com.ost.micro.modules.security.password.PasswordUtils;
 import com.ost.micro.modules.security.user.SecurityUser;
 import com.ost.micro.modules.security.user.UserDetail;
 import com.ost.micro.modules.sys.dto.PasswordDTO;
+import com.ost.micro.modules.sys.dto.SysDeptDTO;
 import com.ost.micro.modules.sys.dto.SysUserDTO;
+import com.ost.micro.modules.sys.dto.SysUserExtDTO;
 import com.ost.micro.modules.sys.excel.SysUserExcel;
+import com.ost.micro.modules.sys.service.SysDeptService;
 import com.ost.micro.modules.sys.service.SysRoleUserService;
 import com.ost.micro.modules.sys.service.SysUserService;
 import com.ost.micro.securitycommon.annotation.LogOperation;
@@ -35,6 +38,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -59,6 +63,8 @@ public class SysUserController {
 	private SysUserService sysUserService;
 	@Autowired
 	private SysRoleUserService sysRoleUserService;
+	@Autowired
+	private SysDeptService sysDeptService;
 
 	@GetMapping("page")
 	@ApiOperation("分页")
@@ -70,8 +76,8 @@ public class SysUserController {
 		@ApiImplicitParam(name = "username", value = "用户名", paramType = "query", dataType="String")
 	})
 	@RequiresPermissions("sys:user:page")
-	public Result<PageData<SysUserDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
-		PageData<SysUserDTO> page = sysUserService.page(params);
+	public Result<PageData<SysUserExtDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+		PageData<SysUserExtDTO> page = sysUserService.page(params);
 		if (null != page && !CollectionUtils.isEmpty(page.getList())) {
 			page.getList().forEach(e->{
 				//用户角色列表
@@ -79,7 +85,7 @@ public class SysUserController {
 				e.setRoleIdList(roleIdList);
 			});
 		}
-		return new Result<PageData<SysUserDTO>>().ok(page);
+		return new Result<PageData<SysUserExtDTO>>().ok(page);
 	}
 
 	@GetMapping("{id}")
@@ -87,12 +93,18 @@ public class SysUserController {
 	@RequiresPermissions("sys:user:info")
 	public Result<SysUserDTO> get(@PathVariable("id") String id){
 		SysUserDTO data = sysUserService.get(id);
-
+		SysUserExtDTO sysUserExtDTO = new SysUserExtDTO();
+		BeanUtils.copyProperties(data,sysUserExtDTO);
 		//用户角色列表
 		List<String> roleIdList = sysRoleUserService.getRoleIdList(id);
 		data.setRoleIdList(roleIdList);
+		sysUserExtDTO.setRoleIdList(roleIdList);
+		if (null != data) {
+			SysDeptDTO deptDTO = sysDeptService.get(data.getDeptId());
+			sysUserExtDTO.setDeptName(deptDTO.getName());
+		}
 
-		return new Result<SysUserDTO>().ok(data);
+		return new Result<SysUserDTO>().ok(sysUserExtDTO);
 	}
 
 	@GetMapping("info")

src/main/java/com/ost/micro/modules/sys/domo/SysUserDo.java

@@ -19,5 +19,5 @@ import lombok.Data;
 @Data
 public class SysUserDo extends SysUserEntity {
 	private String bizId;
-	private Integer bizStatus;
+	private Integer deptStatus;
 }
\ No newline at end of file

src/main/java/com/ost/micro/modules/sys/dto/SysDeptDTO.java

@@ -52,9 +52,6 @@ public class SysDeptDTO extends TreeNode implements Serializable {
 	@ApiModelProperty(value = "商家id")
 	private String bizId;
 
-	@ApiModelProperty(value = "商家状态 0:禁用 1:启用")
-	private String bizStatus;
-
 
 	@ApiModelProperty(value = "备注")
 	private String remark;
@@ -157,12 +154,4 @@ public class SysDeptDTO extends TreeNode implements Serializable {
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
-
-	public String getBizStatus() {
-		return bizStatus;
-	}
-
-	public void setBizStatus(String bizStatus) {
-		this.bizStatus = bizStatus;
-	}
 }
\ No newline at end of file

src/main/java/com/ost/micro/modules/sys/dto/SysUserExtDTO.java

@@ -25,7 +25,7 @@ public class SysUserExtDTO extends  SysUserDTO{
 	private String bizId;
 
 	@ApiModelProperty(value = "商家编名称")
-	private Integer bizStatus;
+	private Integer deptStatus;
 
 	@ApiModelProperty(value = "部门名称")
 	private String deptName;
@@ -39,12 +39,12 @@ public class SysUserExtDTO extends  SysUserDTO{
 		this.bizId = bizId;
 	}
 
-	public Integer getBizStatus() {
-		return bizStatus;
+	public Integer getDeptStatus() {
+		return deptStatus;
 	}
 
-	public void setBizStatus(Integer bizStatus) {
-		this.bizStatus = bizStatus;
+	public void setDeptStatus(Integer deptStatus) {
+		this.deptStatus = deptStatus;
 	}
 
 	public String getDeptName() {

src/main/java/com/ost/micro/modules/sys/service/SysUserService.java

@@ -24,7 +24,7 @@ import java.util.Map;
  */
 public interface SysUserService extends BaseService<SysUserEntity> {
 
-	PageData<SysUserDTO> page(Map<String, Object> params);
+	PageData<SysUserExtDTO> page(Map<String, Object> params);
 
 	List<SysUserDTO> list(Map<String, Object> params);
 

src/main/java/com/ost/micro/modules/sys/service/impl/SysUserServiceImpl.java

@@ -49,7 +49,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 	private SysDeptService sysDeptService;
 
 	@Override
-	public PageData<SysUserDTO> page(Map<String, Object> params) {
+	public PageData<SysUserExtDTO> page(Map<String, Object> params) {
 		//转换成like
 		paramsToLike(params, "username");
 
@@ -65,7 +65,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 		//查询
 		List<SysUserEntity> list = baseDao.getList(params);
 
-		return getPageData(list, page.getTotal(), SysUserDTO.class);
+		return getPageData(list, page.getTotal(), SysUserExtDTO.class);
 	}
 
 	@Override

src/main/resources/mapper/sys/SysUserDao.xml

@@ -24,7 +24,7 @@
 
 	<select id="getByUsername" parameterType="map" resultType="com.ost.micro.modules.sys.domo.SysUserDo">
 	  	<!--select * from sys_user where username = #{value}-->
-		select a.*,b.biz_id,b.biz_status from sys_user a left join sys_dept b on a.dept_id = b.id
+		select a.*,b.biz_id,b.status as dept_status  from sys_user a left join sys_dept b on a.dept_id = b.id
 		<where>
 			<if test="null !=username and '' !=username">
 				and a.username = #{username}

target/classes/mapper/sys/SysUserDao.xml

@@ -24,7 +24,7 @@
 
 	<select id="getByUsername" parameterType="map" resultType="com.ost.micro.modules.sys.domo.SysUserDo">
 	  	<!--select * from sys_user where username = #{value}-->
-		select a.*,b.biz_id,b.biz_status from sys_user a left join sys_dept b on a.dept_id = b.id
+		select a.*,b.biz_id,b.status as dept_status  from sys_user a left join sys_dept b on a.dept_id = b.id
 		<where>
 			<if test="null !=username and '' !=username">
 				and a.username = #{username}