|
@@ -16,7 +16,7 @@ public class UserProvider {
|
|
|
*/
|
|
|
public String findAllBySearchKey(String searchKey){
|
|
|
StringBuffer sql = new StringBuffer("" +
|
|
|
- "SELECT z.id, z.user_name as userName, z.real_name as realName, z.phone, z.sex, z.status, z.email, z.identity, z.create_time, z.update_time," +
|
|
|
+ "SELECT z.id, z.user_name as userName, z.real_name as realName, z.phone, z.sex, z.status, z.email, z.identity,z.nickname, z.create_time, z.update_time," +
|
|
|
" c.role_key, c.role_name " +
|
|
|
"FROM tb_user z LEFT JOIN (select * FROM tb_user_role GROUP BY user_id) a ON a.user_id = z.id LEFT JOIN `tb_role` c ON c.id = a.role_id where z.rec_status = 'A' ");
|
|
|
if(StrUtil.isNotBlank(searchKey)){
|