..

.gitignore

@@ -1,3 +1,4 @@
<<<<<<< HEAD
# Compiled class file
*.class
target
@@ -29,4 +30,36 @@ hs_err_pid*
.classpath
.settings
.project
src/main/resources/application-dev.yml
=======
# Compiled class file
*.class
target
.settings
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
*.zip
*.tar.gz
*.rar
*.iml
.idea
.vscode
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
.factorypath
.classpath
.settings
.project
src/main/resources/application-dev.yml

src/main/java/io/renren/modules/admin/member/controller/MemberController.java

@@ -2,6 +2,7 @@ package io.renren.modules.admin.member.controller;
import java.util.Arrays;
import java.util.Map;
import java.util.Date;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -85,6 +86,7 @@ public class MemberController extends AbstractController  {
    @ApiOperation("修改")
    public R update(@RequestBody MemberEntity member){
        ValidatorUtils.validateEntity(member, UpdateGroup.class);
        member.setModifyTime(new Date());
        member.setModifyId(getUserId());
		memberService.updateById(member);
@@ -106,7 +108,6 @@ public class MemberController extends AbstractController  {
    @RequiresPermissions("admin:member:delete")
    @ApiOperation("删除")
    public R delete(@RequestBody Long[] ids){
        // memberService.removeByIds(Arrays.asList(ids));
        memberService.delete(ids);
        return R.ok();
    }
@@ -118,9 +119,9 @@ public class MemberController extends AbstractController  {
        // memberService.removeByIds(Arrays.asList(ids));
        Long id = Long.valueOf(param.get("id").toString());
        Integer status = Integer.valueOf(param.get("status").toString());
        System.out.println(id);
        System.out.println(status);
        int it = memberService.updateStatus(id, status);
        // System.out.println(id);
        // System.out.println(status);
        memberService.updateStatus(id, status);
        return R.ok();
    }
}

src/main/java/io/renren/modules/admin/member/entity/MemberEntity.java

@@ -33,7 +33,7 @@ public class MemberEntity implements Serializable {
	/**
	 * 用户名
	 */
	@NotBlank(message="用户名不能为空", groups = {AddGroup.class, UpdateGroup.class})
	@NotBlank(message="用户名不能为空", groups = AddGroup.class)
	private String username;
	/**
	 * 密码

src/main/java/io/renren/modules/admin/member/service/impl/MemberServiceImpl.java

@@ -29,15 +29,14 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String username = (String)params.get("username");
        String truename = (String)params.get("truename");
        String key = (String)params.get("key");
        // System.out.println(key);
        IPage<MemberEntity> page = this.page(
                new Query<MemberEntity>().getPage(params),
                new QueryWrapper<MemberEntity>()
                .like(StringUtils.isNotBlank(username),"username", username)
                .like(StringUtils.isNotBlank(key),"username", key)
                .or()
                .like(StringUtils.isNotBlank(truename),"truename", truename)
                .like(StringUtils.isNotBlank(key),"truename", key)
        );
        return new PageUtils(page);
@@ -57,7 +56,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
    @Override
	@Transactional
    public void update(MemberEntity member) {
        member.setModifyTime(new Date());
        
        member.setUsername(null);
        if(StringUtils.isBlank(member.getPassword())){
			member.setPassword(null);
		}else{