..

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

@@ -135,7 +135,7 @@ public class MemberController extends AbstractController {
        String remark =params.get("remark").toString();
        int res = memberService.updateRemark(id, remark);
        if (res == 0) {
            return R.error();
            return R.error("更改备注失败");
        }
        return R.ok();
    }
@@ -149,7 +149,7 @@ public class MemberController extends AbstractController {
    @RequiresPermissions("admin:member:update")
    public R flag(@RequestBody Map<String, Object> params){   
        Long id = Long.valueOf(params.get("id").toString());
        Long flag = Long.valueOf(params.get("flag").toString());
        Integer flag = Integer.valueOf(params.get("flag").toString());
        int res = memberService.updateFlag(id, flag);
        if (res == 0) {
            return R.error("用户不存在");

src/main/java/io/renren/modules/admin/dao/MemberDao.java

@@ -22,7 +22,7 @@ public interface MemberDao extends BaseMapper<MemberEntity> {
    int updateRemark(Long id, String remark);
    @Update("update member set flag=#{flag} where id=#{id};")
	int updateFlag(Long id, Long flag);
	int updateFlag(Long id, Integer flag);
    @Select("select `member`.`id` AS `id`,`member`.`truename` AS `truename`,`member`.`organization` AS `organization`,`member`.`position` AS `position`,`member`.`phone` AS `phone`,`member`.`remark` AS `remark`,if(isnull(`attenders`.`id`),0,1) AS `receipt`,`attenders`.`id` AS `aid`,#{meetingId} AS `meeting_id`,`member`.`symbol` AS `symbol` from (`member` left join `attenders` on((`attenders`.`member_id` = `member`.`id`) and (`attenders`.`meeting_id` = #{meetingId}))) where truename like '%${key1}%' or phone like '%${key2}%' limit #{offest},#{limit}")
	List<Map<String, Object>> getInvitationPageList(Long meetingId, String key1, String key2, int offest, int limit);

src/main/java/io/renren/modules/admin/service/MemberService.java

@@ -17,7 +17,7 @@ import io.renren.modules.admin.entity.MemberEntity;
public interface MemberService extends IService<MemberEntity> {
    PageUtils queryPage(Map<String, Object> params);
    
    /**
     * 修改备注
     * @param id
@@ -25,6 +25,8 @@ public interface MemberService extends IService<MemberEntity> {
     * @return
     */
    int updateRemark(Long id, String remark);
    
    int updateFlag(Long id, Integer flag);
    /**
     * 通过标识查找会员信息
@@ -37,10 +39,9 @@ public interface MemberService extends IService<MemberEntity> {
    boolean updateMember(MemberEntity member);
	int updateFlag(Long id, Long flag);
    PageUtils queryInvitationPage(Map<String, Object> params);
    
    MemberEntity saveMember(String truename, String phone, String organization, String position);
}

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

@@ -60,7 +60,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
    }
    @Override
    public int updateFlag(Long id, Long flag) {
    public int updateFlag(Long id, Integer flag) {
        return baseMapper.updateFlag(id, flag);
    }