|
|
|
@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
@ -117,10 +118,18 @@ public class AdminUserController extends BaseController { |
|
|
|
*/ |
|
|
|
@RequestMapping("/getUser") |
|
|
|
public JSONObject getUser(){ |
|
|
|
List ulist = new ArrayList(); |
|
|
|
List<Admin> admlist = adminService.getAllAdmin(); |
|
|
|
for (Admin ad:admlist){ |
|
|
|
Map umap = new HashMap(); |
|
|
|
umap.put("account_name",ad.getAccountName()); |
|
|
|
umap.put("id",ad.getId()); |
|
|
|
umap.put("account_id",ad.getAccountId()); |
|
|
|
ulist.add(umap); |
|
|
|
} |
|
|
|
jsonObject.put("code",200); |
|
|
|
jsonObject.put("msg","成功"); |
|
|
|
jsonObject.put("data",admlist); |
|
|
|
jsonObject.put("data",ulist); |
|
|
|
return jsonObject; |
|
|
|
} |
|
|
|
} |
|
|
|
|