user

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

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

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

@@ -7,6 +7,7 @@ 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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.govmade.common.utils.Constant;
 import com.govmade.common.utils.PageUtils;
@@ -52,10 +53,10 @@ public class UserController extends AbstractController {
 	 * 用户列表
 	 */
 	@GetMapping("/list")
-	public R list(Map<String, Object> params) {
+	public R list(@RequestParam Map<String, Object> params) {
 
 		// 只有超级管理员，才能查看所有用户列表
-		if (getUserId() != Constant.SUPER_ADMIN) {
+		if (getUserId() == Constant.SUPER_ADMIN) {
 			params.put("createBy", getUserId());
 		} else {
 			params.put("deptId", getUser().getDeptId()); // 部门管理员，查看本部门用户列表

src/main/java/com/govmade/modules/system/service/impl/UserServiceImpl.java

@@ -30,9 +30,10 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 		// TODO Auto-generated method stub
 		String username = (String) params.get("username");
 		Long createBy = (Long) params.get("createBy");
+		Long deptId = (Long) params.get("deptId");
 
 		Page<UserEntity> page = this.selectPage(new Query<UserEntity>(params).getPage(), new EntityWrapper<UserEntity>()
-				.eq(StrUtil.isNotBlank(username), "username", username).eq(createBy != null, "create_by", createBy));
+				.eq(StrUtil.isNotBlank(username), "username", username).eq(deptId != null, "dept_id", deptId).eq(createBy != null, "create_by", createBy));
 		return new PageUtils(page);
 	}