did 改回deptId

src/main/java/com/govmade/modules/basic/controller/AbstractController.java

@@ -18,7 +18,7 @@ public abstract class AbstractController {
 	protected UserEntity getUser() {
 		//return (UserEntity) SecurityUtils.getSubject().getPrincipal();
 		UserEntity ue = new UserEntity();
-		ue.setDid(1L);
+		ue.setDeptId(1L);
 		return null;
 	}
 

src/main/java/com/govmade/modules/system/controller/UserController.java

@@ -58,7 +58,7 @@ public class UserController extends AbstractController {
 		if (getUserId() != Constant.SUPER_ADMIN) {
 			params.put("createBy", getUserId());
 		} else {
-			params.put("deptId", getUser().getDid()); // 部门管理员，查看本部门用户列表
+			params.put("deptId", getUser().getDeptId()); // 部门管理员，查看本部门用户列表
 		}
 		PageUtils page = userService.queryPage(params);
 

src/main/java/com/govmade/modules/system/entity/UserEntity.java

@@ -17,7 +17,7 @@ public class UserEntity extends BaseEntity<Long> {
 
 	private static final long serialVersionUID = 1L;
 
-	private Long did; // 部门ID
+	private Long deptId; // 部门ID
 
 	private Long roleId; // 角色ID
 
@@ -35,13 +35,12 @@ public class UserEntity extends BaseEntity<Long> {
 
 	private Date lastLoginTime; // 最后一次登录时间
 
-
-	public Long getDid() {
-		return did;
+	public Long getDeptId() {
+		return deptId;
 	}
 
-	public void setDid(Long did) {
-		this.did = did;
+	public void setDeptId(Long deptId) {
+		this.deptId = deptId;
 	}
 
 	public Long getRoleId() {

src/test/java/test/UserTest.java

@@ -19,7 +19,7 @@ public class UserTest {
 	public void contextLoads() {
 		UserEntity user = new UserEntity();
 		user.setEmail("qqq@qq.com");
-		user.setDid(1L);
+		user.setDeptId(1L);
 		user.setRoleId(1L);
 		
 		System.out.println(user);