huwhois %!s(int64=5) %!d(string=hace) años
padre
commit
35cd08b78a

+ 21 - 1
src/main/java/io/renren/modules/admin/controller/AttendersController.java

@ -99,8 +99,28 @@ public class AttendersController extends AbstractController  {
99 99
                member.setIsCheck(1);
100 100
                member.setCreateId(getUserId());
101 101
                memberService.saveMember(member);
102
                attenders.setMemberId(member.getId());
103
            } else {
104
                member.setUsername(attenders.getPhone());
105
                member.setTruename(attenders.getName());
106
                member.setOrganization(attenders.getOrganization());
107
                member.setPosition(attenders.getPosition());
108
                member.setJobTitle(attenders.getJobTitle());
109
                member.setPhone(attenders.getPhone());
110
                member.setEmail(attenders.getEmail());
111
                memberService.updateById(member);
102 112
            }
103
            attenders.setMemberId(member.getId());
113
        } else {
114
            MemberEntity member = new MemberEntity();
115
            member.setId(attenders.getMemberId());
116
            member.setUsername(attenders.getPhone());
117
            member.setTruename(attenders.getName());
118
            member.setOrganization(attenders.getOrganization());
119
            member.setPosition(attenders.getPosition());
120
            member.setJobTitle(attenders.getJobTitle());
121
            member.setPhone(attenders.getPhone());
122
            member.setEmail(attenders.getEmail());
123
            memberService.updateById(member);
104 124
        }
105 125
        attenders.setCreateTime(new Date());
106 126
        attenders.setCreater(getUserId());

+ 9 - 0
src/main/java/io/renren/modules/admin/controller/MemberController.java

@ -144,4 +144,13 @@ public class MemberController extends AbstractController  {
144 144
		memberService.updateById(member);
145 145
        return R.ok();
146 146
    }
147
148
    @GetMapping("/listbyname")
149
    @RequiresPermissions("admin:member:list")
150
    public R repassword(@RequestParam Map<String, Object> params){
151
        String name = params.get("name").toString();
152
        List<Map<String, Object>> list = memberService.getListByName();
153
                
154
        return R.ok().put("page", page);
155
    }
147 156
}